Skip to content
This repository was archived by the owner on Apr 21, 2023. It is now read-only.

Commit 124c3c5

Browse files
nicolas-grekasnicolas-grekas
committed
sync with latest VarDumper
1 parent 89cb2b8 commit 124c3c5

8 files changed

Lines changed: 65 additions & 56 deletions

File tree

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

Lines changed: 11 additions & 10 deletions
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,6 +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+/', 'sf-dump', $dump);
8081
}
8182
$this->assertEquals($expectedOutput, $dump);
8283
}
@@ -85,20 +86,20 @@ public function getDumpArgs()
8586
{
8687
return array(
8788
array(array(), array(), '', false),
88-
array(array(), array(), "<pre id=sf-dump><span class=sf-dump-0>[]\n</span></pre><script>Sfjs.dump.instrument()</script>\n"),
89+
array(array(), array(), "<pre class=sf-dump>[]\n</pre><script>Sfdump.instrument()</script>\n"),
8990
array(
9091
array(),
9192
array(123, 456),
92-
"<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-num>123</span>\n</span></pre><script>Sfjs.dump.instrument()</script>\n"
93-
."<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-num>456</span>\n</span></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",
9495
),
9596
array(
9697
array('foo' => 'bar'),
9798
array(),
98-
"<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-note>array:1</span> [<span name=sf-dump-child>\n"
99-
." <span class=sf-dump-1>\"<span class=sf-dump-meta>foo</span>\" => \"<span class=sf-dump-str>bar</span>\"\n"
100-
."</span></span>]\n"
101-
."</span></pre><script>Sfjs.dump.instrument()</script>\n",
99+
"<pre class=sf-dump><span class=sf-dump-note>array:1</span> [<span name=sf-dump-child>\n"
100+
." \"<span class=sf-dump-meta>foo</span>\" => \"<span class=sf-dump-str>bar</span>\"\n"
101+
."</span>]\n"
102+
."</pre><script>Sfdump.instrument()</script>\n",
102103
),
103104
);
104105
}

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

Lines changed: 0 additions & 5 deletions
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‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,25 @@
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="twig.extension.dump.class">Symfony\Bridge\Twig\Extension\DumpExtension</parameter>
9-
<parameter key="data_collector.dump.class">Symfony\Component\HttpKernel\DataCollector\DumpDataCollector</parameter>
10-
<parameter key="debug.dump_listener.class">Symfony\Component\HttpKernel\EventListener\DumpListener</parameter>
11-
</parameters>
12-
137
<services>
14-
<service id="twig.extension.dump" class="%twig.extension.dump.class%" public="false">
8+
<service id="twig.extension.dump" class="Symfony\Bridge\Twig\Extension\DumpExtension" public="false">
159
<tag name="twig.extension" />
1610
<argument type="service" id="var_dumper.cloner" />
1711
</service>
1812

19-
<service id="data_collector.dump" class="%data_collector.dump.class%">
13+
<service id="data_collector.dump" class="Symfony\Component\HttpKernel\DataCollector\DumpDataCollector">
2014
<tag name="data_collector" id="dump" template="@Debug/Profiler/Base/dump.html.twig" />
2115
<argument type="service" id="debug.stopwatch" on-invalid="ignore" />
2216
<argument>%templating.helper.code.file_link_format%</argument>
2317
</service>
2418

25-
<service id="debug.dump_listener" class="%debug.dump_listener.class%">
19+
<service id="debug.dump_listener" class="Symfony\Component\HttpKernel\EventListener\DumpListener">
2620
<tag name="kernel.event_subscriber" />
2721
<argument type="service" id="service_container" />
2822
<argument>data_collector.dump</argument>
2923
</service>
3024

31-
<service id="var_dumper.cloner" class="%var_dumper.cloner.class%" />
25+
<service id="var_dumper.cloner" class="Symfony\Component\VarDumper\Cloner\VarCloner" />
3226
</services>
3327

3428
</container>

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

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,27 @@
1010
{% endset %}
1111

1212
{% set text %}
13-
<div style="width: 450px; overflow: hidden;">
13+
<div class="sf-toolbar-info-piece">
14+
<b>dump()</b>
15+
</div>
16+
{% for dump in collector.getDumps('html') %}
1417
<div class="sf-toolbar-info-piece">
15-
<b>dump()</b>
16-
</div>
17-
{% for dump in collector.getDumps('html') %}
18-
<div class="sf-toolbar-info-piece">
19-
in
20-
{% if dump.file %}
21-
{% set link = dump.file|file_link(dump.line) %}
22-
{% if link %}
23-
<a href="{{ link }}" title="{{ dump.file }}">{{ dump.name }}</a>
24-
{% else %}
25-
<abbr title="{{ dump.file }}">{{ dump.name }}</abbr>
26-
{% endif %}
18+
in
19+
{% if dump.file %}
20+
{% set link = dump.file|file_link(dump.line) %}
21+
{% if link %}
22+
<a href="{{ link }}" title="{{ dump.file }}">{{ dump.name }}</a>
2723
{% else %}
28-
{{ dump.name }}
24+
<abbr title="{{ dump.file }}">{{ dump.name }}</abbr>
2925
{% endif %}
30-
line {{ dump.line }}:
31-
{{ dump.data|raw }}
32-
</div>
33-
{% endfor %}
34-
<img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" onload="var h = this.parentNode.innerHTML, rx=/<script>(.*?)<\/script>/g, s; while (s = rx.exec(h)) {eval(s[1]);};" />
35-
</div>
26+
{% else %}
27+
{{ dump.name }}
28+
{% endif %}
29+
line {{ dump.line }}:
30+
{{ dump.data|raw }}
31+
</div>
32+
{% endfor %}
33+
<img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" onload="var h = this.parentNode.innerHTML, rx=/<script>(.*?)<\/script>/g, s; while (s = rx.exec(h)) {eval(s[1]);};" />
3634
{% endset %}
3735

3836
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': true } %}
@@ -86,7 +84,7 @@
8684
{{ dump.name }}
8785
{% endif %}
8886
line {{ dump.line }}:
89-
<a onclick="Sfjs.dump.toggle(this)">▶</a>
87+
<a onclick="Sfdump.toggle(this)">▶</a>
9088
<span class="sf-dump-compact">
9189
{% if dump.fileExcerpt %}{{ dump.fileExcerpt|raw }}{% else %}{{ dump.file|file_excerpt(dump.line) }}{% endif %}
9290
</span>

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,19 @@ public function testDump()
3232
$collector->dump($data); $line = __LINE__;
3333
$this->assertSame(1, $collector->getDumpsCount());
3434

35+
$dump = $collector->getDumps('html');
36+
$this->assertTrue(isset($dump[0]['data']));
37+
$dump[0]['data'] = preg_replace('/^.*?<pre/', '<pre', $dump[0]['data']);
38+
3539
$xDump = array(
3640
array(
37-
'data' => "<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-num>123</span>\n</span></pre><script>Sfjs.dump.instrument()</script>\n",
38-
'name' => 'DumpDataCollectorTest.php',
39-
'file' => __FILE__,
40-
'line' => $line,
41-
'fileExcerpt' => false,
41+
'data' => "<pre class=sf-dump><span class=sf-dump-num>123</span>\n</pre><script>Sfdump.instrument()</script>\n",
42+
'name' => 'DumpDataCollectorTest.php',
43+
'file' => __FILE__,
44+
'line' => $line,
45+
'fileExcerpt' => false,
4246
),
4347
);
44-
$dump = $collector->getDumps('html');
45-
$this->assertTrue(isset($dump[0]['data']));
46-
$dump[0]['data'] = preg_replace('/^.*?<pre/', '<pre', $dump[0]['data']);
4748
$this->assertSame($xDump, $dump);
4849

4950
$this->assertStringStartsWith(

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
namespace Symfony\Component\VarDumper\Cloner;
4+
5+
/**
6+
* @deprecated Use VarCloner instead
7+
*/
8+
class ExtCloner extends VarCloner
9+
{
10+
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
namespace Symfony\Component\VarDumper\Cloner;
4+
5+
/**
6+
* @deprecated Use VarCloner instead
7+
*/
8+
class PhpCloner extends VarCloner
9+
{
10+
}

‎src/Symfony/Component/VarDumper/Tests/JsonDumperTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\VarDumper\Tests;
1313

14-
use Symfony\Component\VarDumper\Cloner\PhpCloner;
14+
use Symfony\Component\VarDumper\Cloner\VarCloner;
1515
use Symfony\Component\VarDumper\Dumper\JsonDumper;
1616

1717
/**
@@ -26,7 +26,7 @@ public function testGet()
2626
$decPoint = (string) 0.5;
2727
$decPoint = $decPoint[1];
2828
$dumper = new JsonDumper();
29-
$cloner = new PhpCloner();
29+
$cloner = new VarCloner();
3030
$cloner->addCasters(array(
3131
':stream' => function ($res, $a) {
3232
unset($a['uri']);

0 commit comments

Comments
 (0)