Skip to content

Commit da96ad8

Browse files
nicolas-grekasnicolas-grekas
committed
[VarDumper] Sfdump JS ns and VarCloner replacing Ext+PhpCloner
1 parent 966c586 commit da96ad8

File tree

12 files changed

+105
-286
lines changed

12 files changed

+105
-286
lines changed

‎src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Bridge\Twig\Extension\DumpExtension;
1515
use Symfony\Component\VarDumper\VarDumper;
16-
use Symfony\Component\VarDumper\Cloner\PhpCloner;
16+
use Symfony\Component\VarDumper\Cloner\VarCloner;
1717

1818
class DumpExtensionTest extends \PHPUnit_Framework_TestCase
1919
{
@@ -22,7 +22,7 @@ class DumpExtensionTest extends \PHPUnit_Framework_TestCase
2222
*/
2323
public function testDumpTag($template, $debug, $expectedOutput, $expectedDumped)
2424
{
25-
$extension = new DumpExtension(new PhpCloner());
25+
$extension = new DumpExtension(new VarCloner());
2626
$twig = new \Twig_Environment(new \Twig_Loader_String(), array(
2727
'debug' => $debug,
2828
'cache' => false,
@@ -62,7 +62,7 @@ public function getDumpTags()
6262
*/
6363
public function testDump($context, $args, $expectedOutput, $debug = true)
6464
{
65-
$extension = new DumpExtension(new PhpCloner());
65+
$extension = new DumpExtension(new VarCloner());
6666
$twig = new \Twig_Environment(new \Twig_Loader_String(), array(
6767
'debug' => $debug,
6868
'cache' => false,
@@ -77,7 +77,7 @@ public function testDump($context, $args, $expectedOutput, $debug = true)
7777
if ($debug) {
7878
$this->assertStringStartsWith('<script>', $dump);
7979
$dump = preg_replace('/^.*?<pre/', '<pre', $dump);
80-
$dump = preg_replace('/sf-dump-\\d{2,}/', 'sf-dump', $dump);
80+
$dump = preg_replace('/sf-dump-\d+/', 'sf-dump', $dump);
8181
}
8282
$this->assertEquals($expectedOutput, $dump);
8383
}
@@ -86,20 +86,20 @@ public function getDumpArgs()
8686
{
8787
return array(
8888
array(array(), array(), '', false),
89-
array(array(), array(), "<pre class=sf-dump>[]\n</pre><script>Sfjs.dump.instrument()</script>\n"),
89+
array(array(), array(), "<pre class=sf-dump>[]\n</pre><script>Sfdump.instrument()</script>\n"),
9090
array(
9191
array(),
9292
array(123, 456),
93-
"<pre class=sf-dump><span class=sf-dump-num>123</span>\n</pre><script>Sfjs.dump.instrument()</script>\n"
94-
."<pre class=sf-dump><span class=sf-dump-num>456</span>\n</pre><script>Sfjs.dump.instrument()</script>\n",
93+
"<pre class=sf-dump><span class=sf-dump-num>123</span>\n</pre><script>Sfdump.instrument()</script>\n"
94+
."<pre class=sf-dump><span class=sf-dump-num>456</span>\n</pre><script>Sfdump.instrument()</script>\n",
9595
),
9696
array(
9797
array('foo' => 'bar'),
9898
array(),
9999
"<pre class=sf-dump><span class=sf-dump-note>array:1</span> [<span name=sf-dump-child>\n"
100100
." \"<span class=sf-dump-meta>foo</span>\" => \"<span class=sf-dump-str>bar</span>\"\n"
101101
."</span>]\n"
102-
."</pre><script>Sfjs.dump.instrument()</script>\n",
102+
."</pre><script>Sfdump.instrument()</script>\n",
103103
),
104104
);
105105
}

‎src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php

-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ public function load(array $configs, ContainerBuilder $container)
3434
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
3535
$loader->load('services.xml');
3636

37-
$container->setParameter(
38-
'var_dumper.cloner.class',
39-
'Symfony\Component\VarDumper\Cloner\\'.(function_exists('symfony_zval_info') ? 'Ext' : 'Php').'Cloner'
40-
);
41-
4237
$container->getDefinition('var_dumper.cloner')
4338
->addMethodCall('setMaxItems', array($config['max_items']))
4439
->addMethodCall('setMaxString', array($config['max_string_length']));

‎src/Symfony/Bundle/DebugBundle/Resources/config/services.xml

+3-8
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,20 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

7-
<parameters>
8-
<parameter key="data_collector.dump.class">Symfony\Component\HttpKernel\DataCollector\DumpDataCollector</parameter>
9-
<parameter key="debug.dump_listener.class">Symfony\Component\HttpKernel\EventListener\DumpListener</parameter>
10-
</parameters>
11-
127
<services>
13-
<service id="data_collector.dump" class="%data_collector.dump.class%">
8+
<service id="data_collector.dump" class="Symfony\Component\HttpKernel\DataCollector\DumpDataCollector">
149
<tag name="data_collector" id="dump" template="@Debug/Profiler/dump.html.twig" />
1510
<argument type="service" id="debug.stopwatch" on-invalid="ignore" />
1611
<argument>%templating.helper.code.file_link_format%</argument>
1712
</service>
1813

19-
<service id="debug.dump_listener" class="%debug.dump_listener.class%">
14+
<service id="debug.dump_listener" class="Symfony\Component\HttpKernel\EventListener\DumpListener">
2015
<tag name="kernel.event_subscriber" />
2116
<argument type="service" id="service_container" />
2217
<argument>data_collector.dump</argument>
2318
</service>
2419

25-
<service id="var_dumper.cloner" class="%var_dumper.cloner.class%" />
20+
<service id="var_dumper.cloner" class="Symfony\Component\VarDumper\Cloner\VarCloner" />
2621
</services>
2722

2823
</container>

‎src/Symfony/Bundle/DebugBundle/Resources/views/Profiler/dump.html.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
{{ dump.name }}
8585
{% endif %}
8686
line {{ dump.line }}:
87-
<a onclick="Sfjs.dump.toggle(this)">▶</a>
87+
<a onclick="Sfdump.toggle(this)">▶</a>
8888
<span class="sf-dump-compact">
8989
{% if dump.fileExcerpt %}{{ dump.fileExcerpt|raw }}{% else %}{{ dump.file|file_excerpt(dump.line) }}{% endif %}
9090
</span>

‎src/Symfony/Bundle/TwigBundle/Resources/config/debug.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<parameters>
88
<parameter key="debug.templating.engine.twig.class">Symfony\Bundle\TwigBundle\Debug\TimedTwigEngine</parameter>
9-
<parameter key="twig.extension.dump.class">Symfony\Bridge\Twig\Extension\DumpExtension</parameter>
109
</parameters>
1110

1211
<services>
@@ -17,7 +16,7 @@
1716
<argument type="service" id="debug.stopwatch" />
1817
</service>
1918

20-
<service id="twig.extension.dump" class="%twig.extension.dump.class%" public="false">
19+
<service id="twig.extension.dump" class="Symfony\Bridge\Twig\Extension\DumpExtension" public="false">
2120
<tag name="twig.extension" />
2221
<argument type="service" id="var_dumper.cloner" on-invalid="null" />
2322
</service>

‎src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testDump()
3838

3939
$xDump = array(
4040
array(
41-
'data' => "<pre class=sf-dump><span class=sf-dump-num>123</span>\n</pre><script>Sfjs.dump.instrument()</script>\n",
41+
'data' => "<pre class=sf-dump><span class=sf-dump-num>123</span>\n</pre><script>Sfdump.instrument()</script>\n",
4242
'name' => 'DumpDataCollectorTest.php',
4343
'file' => __FILE__,
4444
'line' => $line,

‎src/Symfony/Component/VarDumper/Cloner/ExtCloner.php

-201
This file was deleted.

0 commit comments

Comments
 (0)