From f3659b684e7474fe6b3d73c6402d0cf8a3998abb Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 18 Feb 2019 19:32:59 +0100 Subject: [PATCH] [VarDumper] dump Closures' parameters once: in their signatures --- .../Component/VarDumper/Caster/ReflectionCaster.php | 13 +------------ .../VarDumper/Tests/Caster/ReflectionCasterTest.php | 5 +---- .../VarDumper/Tests/Dumper/CliDumperTest.php | 7 ------- .../VarDumper/Tests/Dumper/HtmlDumperTest.php | 7 ------- 4 files changed, 2 insertions(+), 30 deletions(-) diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php index 1ecfa2d2d1..5290fedfcf 100644 --- a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php +++ b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php @@ -52,18 +52,7 @@ class ReflectionCaster return []; } - if (isset($a[$prefix.'parameters'])) { - foreach ($a[$prefix.'parameters']->value as &$v) { - $param = $v; - $v = new EnumStub([]); - foreach (static::castParameter($param, [], $stub, true) as $k => $param) { - if ("\0" === $k[0]) { - $v->value[substr($k, 3)] = $param; - } - } - unset($v->value['position'], $v->value['isVariadic'], $v->value['byReference'], $v); - } - } + unset($a[$prefix.'parameters']); if ($f = $c->getFileName()) { $a[$prefix.'file'] = new LinkStub($f, $c->getStartLine()); diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php index fd8194cca5..f53f06ab5f 100644 --- a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php @@ -70,10 +70,7 @@ EOTXT $this->assertDumpMatchesFormat( <<<'EOTXT' Closure($x) { -%Aparameters: { - $x: {} - } - use: { +%Ause: { $a: 123 $b: & 123 } diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php index 3387dcdb24..fc623808ce 100644 --- a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php @@ -81,13 +81,6 @@ array:24 [ "closure" => Closure(\$a, PDO &\$b = null) {#%d class: "Symfony\Component\VarDumper\Tests\Dumper\CliDumperTest" this: Symfony\Component\VarDumper\Tests\Dumper\CliDumperTest {#%d …} - parameters: { - \$a: {} - &\$b: { - typeHint: "PDO" - default: null - } - } file: "%s%eTests%eFixtures%edumb-var.php" line: "{$var['line']} to {$var['line']}" } diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php index da8e21dff9..ae4ee8e6cc 100644 --- a/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php @@ -85,13 +85,6 @@ class HtmlDumperTest extends TestCase class: "Symfony\Component\VarDumper\Tests\Dumper\HtmlDumperTest" this: HtmlDumperTest {#%d &%s;} - parameters: { - \$a: {} - &\$b: { - typeHint: "PDO" - default: null - } - } file: "%s%eVarDumper%eTests%eFixtures%edumb-var.php" line: "{$var['line']} to {$var['line']}"