Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b15ae9c

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4'
* 4.4: [4.4] Fix some leftovers [VarDumper] Output the location of calls to dump()
2 parents 8649f43 + 2b71c6f commit b15ae9c

File tree

8 files changed

+166
-6
lines changed

8 files changed

+166
-6
lines changed

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,19 @@
4040
<argument>0</argument> <!-- flags -->
4141
</service>
4242

43+
<service id="var_dumper.contextualized_cli_dumper" class="Symfony\Component\VarDumper\Dumper\ContextualizedDumper" decorates="var_dumper.cli_dumper">
44+
<argument type="service" id="var_dumper.contextualized_cli_dumper.inner" />
45+
<argument type="collection">
46+
<argument type="service" key="source">
47+
<service class="Symfony\Component\VarDumper\Dumper\ContextProvider\SourceContextProvider">
48+
<argument>%kernel.charset%</argument>
49+
<argument type="string">%kernel.project_dir%</argument>
50+
<argument type="service" id="debug.file_link_formatter" on-invalid="null" />
51+
</service>
52+
</argument>
53+
</argument>
54+
</service>
55+
4356
<service id="var_dumper.html_dumper" class="Symfony\Component\VarDumper\Dumper\HtmlDumper">
4457
<argument>null</argument>
4558
<argument>%kernel.charset%</argument>
@@ -83,7 +96,7 @@
8396
<argument type="collection">
8497
<argument type="service" key="cli">
8598
<service class="Symfony\Component\VarDumper\Command\Descriptor\CliDescriptor">
86-
<argument type="service" id="var_dumper.cli_dumper" />
99+
<argument type="service" id="var_dumper.contextualized_cli_dumper.inner" />
87100
</service>
88101
</argument>
89102
<argument type="service" key="html">

‎src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,11 @@ public function configure(object $event = null)
124124
if ($output instanceof ConsoleOutputInterface) {
125125
$output = $output->getErrorOutput();
126126
}
127-
$this->exceptionHandler = function ($e) use ($app, $output) {
127+
$this->exceptionHandler = static function (\Throwable $e) use ($app, $output) {
128+
if (!$e instanceof \Exception) {
129+
$e = new FatalThrowableError($e);
130+
}
131+
128132
$app->renderException($e, $output);
129133
};
130134
}

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

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\VarDumper\Cloner;
1313

1414
use Symfony\Component\VarDumper\Caster\Caster;
15+
use Symfony\Component\VarDumper\Dumper\ContextProvider\SourceContextProvider;
1516

1617
/**
1718
* @author Nicolas Grekas <[email protected]>
@@ -24,6 +25,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
2425
private $maxDepth = 20;
2526
private $maxItemsPerDepth = -1;
2627
private $useRefHandles = -1;
28+
private $context = [];
2729

2830
/**
2931
* @param array $data An array as returned by ClonerInterface::cloneVar()
@@ -223,6 +225,17 @@ public function withRefHandles(bool $useRefHandles)
223225
return $data;
224226
}
225227

228+
/**
229+
* @return static
230+
*/
231+
public function withContext(array $context)
232+
{
233+
$data = clone $this;
234+
$data->context = $context;
235+
236+
return $data;
237+
}
238+
226239
/**
227240
* Seeks to a specific key in nested data structures.
228241
*
@@ -277,7 +290,18 @@ public function seek($key)
277290
public function dump(DumperInterface $dumper)
278291
{
279292
$refs = [0];
280-
$this->dumpItem($dumper, new Cursor(), $refs, $this->data[$this->position][$this->key]);
293+
$cursor = new Cursor();
294+
295+
if ($cursor->attr = $this->context[SourceContextProvider::class] ?? []) {
296+
$cursor->attr['if_links'] = true;
297+
$cursor->hashType = -1;
298+
$dumper->dumpScalar($cursor, 'default', '^');
299+
$cursor->attr = ['if_links' => true];
300+
$dumper->dumpScalar($cursor, 'default', ' ');
301+
$cursor->hashType = 0;
302+
}
303+
304+
$this->dumpItem($dumper, $cursor, $refs, $this->data[$this->position][$this->key]);
281305
}
282306

283307
/**

‎src/Symfony/Component/VarDumper/Dumper/CliDumper.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function __construct($output = null, string $charset = null, int $flags =
8383
]);
8484
}
8585

86-
$this->displayOptions['fileLinkFormat'] = ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: 'file://%f';
86+
$this->displayOptions['fileLinkFormat'] = ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: 'file://%f#L%l';
8787
}
8888

8989
/**
@@ -486,6 +486,8 @@ protected function style($style, $value, $attr = [])
486486
if (isset($attr['href'])) {
487487
$value = "\033]8;;{$attr['href']}\033\\{$value}\033]8;;\033\\";
488488
}
489+
} elseif ($attr['if_links'] ?? false) {
490+
return '';
489491
}
490492

491493
return $value;
@@ -544,6 +546,10 @@ protected function dumpLine(int $depth, bool $endOfValue = false)
544546

545547
protected function endValue(Cursor $cursor)
546548
{
549+
if (-1 === $cursor->hashType) {
550+
return;
551+
}
552+
547553
if (Stub::ARRAY_INDEXED === $cursor->hashType || Stub::ARRAY_ASSOC === $cursor->hashType) {
548554
if (self::DUMP_TRAILING_COMMA & $this->flags && 0 < $cursor->depth) {
549555
$this->line .= ',';
@@ -624,7 +630,7 @@ private function isWindowsTrueColor(): bool
624630
private function getSourceLink(string $file, int $line)
625631
{
626632
if ($fmt = $this->displayOptions['fileLinkFormat']) {
627-
return \is_string($fmt) ? strtr($fmt, ['%f' => $file, '%l' => $line]) : ($fmt->format($file, $line) ?: 'file://'.$file);
633+
return \is_string($fmt) ? strtr($fmt, ['%f' => $file, '%l' => $line]) : ($fmt->format($file, $line) ?: 'file://'.$file.'#L'.$line);
628634
}
629635

630636
return false;

‎src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\VarDumper\Dumper;
13+
14+
use Symfony\Component\VarDumper\Cloner\Data;
15+
use Symfony\Component\VarDumper\Dumper\ContextProvider\ContextProviderInterface;
16+
17+
/**
18+
* @author Kévin Thérage <[email protected]>
19+
*/
20+
class ContextualizedDumper implements DataDumperInterface
21+
{
22+
private $wrappedDumper;
23+
private $contextProviders;
24+
25+
/**
26+
* @param ContextProviderInterface[] $contextProviders
27+
*/
28+
public function __construct(DataDumperInterface $wrappedDumper, array $contextProviders)
29+
{
30+
$this->wrappedDumper = $wrappedDumper;
31+
$this->contextProviders = $contextProviders;
32+
}
33+
34+
public function dump(Data $data)
35+
{
36+
$context = [];
37+
foreach ($this->contextProviders as $contextProvider) {
38+
$context[\get_class($contextProvider)] = $contextProvider->getContext();
39+
}
40+
41+
$this->wrappedDumper->dump($data->withContext($context));
42+
}
43+
}

‎src/Symfony/Component/VarDumper/Tests/Cloner/VarClonerTest.php

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ public function testMaxIntBoundary()
5353
[maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
5454
[maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
5555
[useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
56+
[context:Symfony\Component\VarDumper\Cloner\Data:private] => Array
57+
(
58+
)
59+
5660
)
5761
5862
EOTXT;
@@ -141,6 +145,10 @@ public function testClone()
141145
[maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
142146
[maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
143147
[useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
148+
[context:Symfony\Component\VarDumper\Cloner\Data:private] => Array
149+
(
150+
)
151+
144152
)
145153
146154
EOTXT;
@@ -309,6 +317,10 @@ public function testLimits()
309317
[maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
310318
[maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
311319
[useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
320+
[context:Symfony\Component\VarDumper\Cloner\Data:private] => Array
321+
(
322+
)
323+
312324
)
313325
314326
EOTXT;
@@ -327,7 +339,7 @@ public function testJsonCast()
327339
$clone = $cloner->cloneVar($data);
328340

329341
$expected = <<<'EOTXT'
330-
object(Symfony\Component\VarDumper\Cloner\Data)#%i (6) {
342+
object(Symfony\Component\VarDumper\Cloner\Data)#%d (7) {
331343
["data":"Symfony\Component\VarDumper\Cloner\Data":private]=>
332344
array(2) {
333345
[0]=>
@@ -372,6 +384,9 @@ public function testJsonCast()
372384
int(-1)
373385
["useRefHandles":"Symfony\Component\VarDumper\Cloner\Data":private]=>
374386
int(-1)
387+
["context":"Symfony\Component\VarDumper\Cloner\Data":private]=>
388+
array(0) {
389+
}
375390
}
376391

377392
EOTXT;
@@ -432,6 +447,10 @@ public function testCaster()
432447
[maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
433448
[maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
434449
[useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
450+
[context:Symfony\Component\VarDumper\Cloner\Data:private] => Array
451+
(
452+
)
453+
435454
)
436455
437456
EOTXT;
@@ -501,6 +520,10 @@ public function testPhp74()
501520
[maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
502521
[maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
503522
[useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
523+
[context:Symfony\Component\VarDumper\Cloner\Data:private] => Array
524+
(
525+
)
526+
504527
)
505528

506529
EOTXT;

‎src/Symfony/Component/VarDumper/Tests/Dumper/ContextualizedDumperTest.php

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\VarDumper\Tests\Dumper;
13+
14+
use PHPUnit\Framework\TestCase;
15+
use Symfony\Component\VarDumper\Cloner\VarCloner;
16+
use Symfony\Component\VarDumper\Dumper\CliDumper;
17+
use Symfony\Component\VarDumper\Dumper\ContextProvider\SourceContextProvider;
18+
use Symfony\Component\VarDumper\Dumper\ContextualizedDumper;
19+
20+
/**
21+
* @author Kévin Thérage <[email protected]>
22+
*/
23+
class ContextualizedDumperTest extends TestCase
24+
{
25+
public function testContextualizedCliDumper()
26+
{
27+
$wrappedDumper = new CliDumper('php://output');
28+
$wrappedDumper->setColors(true);
29+
30+
$var = 'example';
31+
$href = sprintf('file://%s#L%s', __FILE__, 37);
32+
$dumper = new ContextualizedDumper($wrappedDumper, [new SourceContextProvider()]);
33+
$cloner = new VarCloner();
34+
$data = $cloner->cloneVar($var);
35+
36+
ob_start();
37+
$dumper->dump($data);
38+
$out = ob_get_clean();
39+
40+
$this->assertStringContainsString("\e]8;;{$href}\e\\\e[", $out);
41+
$this->assertStringContainsString("m{$var}\e[", $out);
42+
}
43+
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
use Symfony\Component\VarDumper\Caster\ReflectionCaster;
1515
use Symfony\Component\VarDumper\Cloner\VarCloner;
1616
use Symfony\Component\VarDumper\Dumper\CliDumper;
17+
use Symfony\Component\VarDumper\Dumper\ContextProvider\SourceContextProvider;
18+
use Symfony\Component\VarDumper\Dumper\ContextualizedDumper;
1719
use Symfony\Component\VarDumper\Dumper\HtmlDumper;
1820

1921
// Load the global dump() function
@@ -38,6 +40,8 @@ public static function dump($var)
3840
$dumper = \in_array(\PHP_SAPI, ['cli', 'phpdbg']) ? new CliDumper() : new HtmlDumper();
3941
}
4042

43+
$dumper = new ContextualizedDumper($dumper, [new SourceContextProvider()]);
44+
4145
self::$handler = function ($var) use ($cloner, $dumper) {
4246
$dumper->dump($cloner->cloneVar($var));
4347
};

0 commit comments

Comments
 (0)