minor #49472 [DependencyInjection] Only dump array keys when value is not a list (ruudk)

nicolas-grekas · nicolas-grekas · commit 24a5f20c07c3 · 2023-02-21T15:35:01.000+01:00
This PR was merged into the 6.3 branch. Discussion ---------- [DependencyInjection] Only dump array keys when value is not a list | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? |no | Deprecations? | no | Tickets | | License | MIT | Doc PR | When the value is a list, there is no point in dumping the keys. Commits ------- a46e46f Only dump array keys when value is not a list
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1796,9 +1796,10 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
             if ($value && $interpolate && false !== $param = array_search($value, $this->container->getParameterBag()->all(), true)) {
                 return $this->dumpValue("%$param%");
             }
+            $isList = array_is_list($value);
             $code = [];
             foreach ($value as $k => $v) {
-                $code[] = sprintf('%s => %s', $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate));
+                $code[] = $isList ? $this->dumpValue($v, $interpolate) : sprintf('%s => %s', $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate));
             }
 
             return sprintf('[%s]', implode(', ', $code));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
@@ -31,7 +31,7 @@ class getClosureService extends ProjectServiceContainer
 
         $container->services['closure'] = $instance = new \stdClass();
 
-        $instance->closures = [0 => #[\Closure(name: 'foo', class: 'FooClass')] static function () use ($containerRef): ?\stdClass {
+        $instance->closures = [#[\Closure(name: 'foo', class: 'FooClass')] static function () use ($containerRef): ?\stdClass {
             $container = $containerRef->get();
 
             return ($container->services['foo'] ?? null);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_adawson.php
@@ -63,7 +63,7 @@ protected static function getBusService($container)
 
         $b = ($container->privates['App\\Schema'] ?? self::getSchemaService($container));
         $c = new \App\Registry();
-        $c->processor = [0 => $a, 1 => $instance];
+        $c->processor = [$a, $instance];
 
         $d = new \App\Processor($c, $a);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
@@ -385,7 +385,7 @@ protected static function getManager3Service($container, $lazyLoad = true)
             return $container->services['manager3'];
         }
         $b = new \stdClass();
-        $b->listener = [0 => $a];
+        $b->listener = [$a];
 
         return $container->services['manager3'] = new \stdClass($b);
     }
@@ -588,7 +588,7 @@ protected static function getManager4Service($container, $lazyLoad = true)
 
         $container->privates['manager4'] = $instance = new \stdClass($a);
 
-        $a->listener = [0 => ($container->services['listener4'] ?? self::getListener4Service($container))];
+        $a->listener = [($container->services['listener4'] ?? self::getListener4Service($container))];
 
         return $instance;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_public.php
@@ -219,7 +219,7 @@ protected static function getConnection3Service($container)
     {
         $container->services['connection3'] = $instance = new \stdClass();
 
-        $instance->listener = [0 => ($container->services['listener3'] ?? self::getListener3Service($container))];
+        $instance->listener = [($container->services['listener3'] ?? self::getListener3Service($container))];
 
         return $instance;
     }
@@ -233,7 +233,7 @@ protected static function getConnection4Service($container)
     {
         $container->services['connection4'] = $instance = new \stdClass();
 
-        $instance->listener = [0 => ($container->services['listener4'] ?? self::getListener4Service($container))];
+        $instance->listener = [($container->services['listener4'] ?? self::getListener4Service($container))];
 
         return $instance;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_uninitialized_ref.php
@@ -62,15 +62,15 @@ protected static function getBarService($container)
         $instance->foo1 = ($container->services['foo1'] ?? null);
         $instance->foo2 = null;
         $instance->foo3 = ($container->privates['foo3'] ?? null);
-        $instance->closures = [0 => #[\Closure(name: 'foo1', class: 'stdClass')] static function () use ($containerRef) {
+        $instance->closures = [#[\Closure(name: 'foo1', class: 'stdClass')] static function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->services['foo1'] ?? null);
-        }, 1 => #[\Closure(name: 'foo2')] static function () use ($containerRef) {
+        }, #[\Closure(name: 'foo2')] static function () use ($containerRef) {
             $container = $containerRef->get();
 
             return null;
-        }, 2 => #[\Closure(name: 'foo3', class: 'stdClass')] static function () use ($containerRef) {
+        }, #[\Closure(name: 'foo3', class: 'stdClass')] static function () use ($containerRef) {
             $container = $containerRef->get();
 
             return ($container->privates['foo3'] ?? null);

Original file line number	Diff line number	Diff line change
`@@ -1796,9 +1796,10 @@ private function dumpValue(mixed $value, bool $interpolate = true): string`
`1796`	`1796`	`if ($value && $interpolate && false !== $param = array_search($value, $this->container->getParameterBag()->all(), true)) {`
`1797`	`1797`	`return $this->dumpValue("%$param%");`
`1798`	`1798`	`}`
	`1799`	`+ $isList = array_is_list($value);`
`1799`	`1800`	`$code = [];`
`1800`	`1801`	`foreach ($value as $k => $v) {`
`1801`		`- $code[] = sprintf('%s => %s', $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate));`
	`1802`	`+ $code[] = $isList ? $this->dumpValue($v, $interpolate) : sprintf('%s => %s', $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate));`
`1802`	`1803`	`}`
`1803`	`1804`
`1804`	`1805`	`return sprintf('[%s]', implode(', ', $code));`
Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ protected static function getManager3Service($container, $lazyLoad = true)`
`385`	`385`	`return $container->services['manager3'];`
`386`	`386`	`}`
`387`	`387`	`$b = new \stdClass();`
`388`		`- $b->listener = [0 => $a];`
	`388`	`+ $b->listener = [$a];`
`389`	`389`
`390`	`390`	`return $container->services['manager3'] = new \stdClass($b);`
`391`	`391`	`}`
`@@ -588,7 +588,7 @@ protected static function getManager4Service($container, $lazyLoad = true)`
`588`	`588`
`589`	`589`	`$container->privates['manager4'] = $instance = new \stdClass($a);`
`590`	`590`
`591`		`- $a->listener = [0 => ($container->services['listener4'] ?? self::getListener4Service($container))];`
	`591`	`+ $a->listener = [($container->services['listener4'] ?? self::getListener4Service($container))];`
`592`	`592`
`593`	`593`	`return $instance;`
`594`	`594`	`}`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ protected static function getConnection3Service($container)`
`219`	`219`	`{`
`220`	`220`	`$container->services['connection3'] = $instance = new \stdClass();`
`221`	`221`
`222`		`- $instance->listener = [0 => ($container->services['listener3'] ?? self::getListener3Service($container))];`
	`222`	`+ $instance->listener = [($container->services['listener3'] ?? self::getListener3Service($container))];`
`223`	`223`
`224`	`224`	`return $instance;`
`225`	`225`	`}`
`@@ -233,7 +233,7 @@ protected static function getConnection4Service($container)`
`233`	`233`	`{`
`234`	`234`	`$container->services['connection4'] = $instance = new \stdClass();`
`235`	`235`
`236`		`- $instance->listener = [0 => ($container->services['listener4'] ?? self::getListener4Service($container))];`
	`236`	`+ $instance->listener = [($container->services['listener4'] ?? self::getListener4Service($container))];`
`237`	`237`
`238`	`238`	`return $instance;`
`239`	`239`	`}`