[DI] Fix dumping null ServiceClosureArgument

nicolas-grekas · nicolas-grekas · commit 35977fdf0aee · 2017-03-09T09:35:59.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1690,7 +1690,7 @@ private function dumpValue($value, $interpolate = true)
         return $this->export($value);
     }
 
-    private function dumpServiceClosure(Reference $reference, $interpolate, $oneLine)
+    private function dumpServiceClosure(Reference $reference = null, $interpolate, $oneLine)
     {
         $code = $this->dumpValue($reference, $interpolate);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -657,8 +657,10 @@ public function testServiceLocator()
             ->addArgument(array(
                 'bar' => new ServiceClosureArgument(new Reference('bar_service')),
                 'baz' => new ServiceClosureArgument(new TypedReference('baz_service', 'stdClass')),
+                'nil' => $nil = new ServiceClosureArgument(new Reference('nil')),
             ))
         ;
+        $nil->setValues(array(null));
         $container->register('bar_service', 'stdClass')->setArguments(array(new Reference('baz_service')));
         $container->register('baz_service', 'stdClass')->setPublic(false);
         $container->compile();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_locator.php
@@ -88,6 +88,8 @@ protected function getFooServiceService()
             return ${($_ = isset($this->services['bar_service']) ? $this->services['bar_service'] : $this->get('bar_service')) && false ?: '_'};
         }, 'baz' => function () {
             $f = function (\stdClass $v) { return $v; }; return $f(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->getBazServiceService()) && false ?: '_'});
+        }, 'nil' => function () {
+            return NULL;
         }));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1690,7 +1690,7 @@ private function dumpValue($value, $interpolate = true)`
`1690`	`1690`	`return $this->export($value);`
`1691`	`1691`	`}`
`1692`	`1692`
`1693`		`- private function dumpServiceClosure(Reference $reference, $interpolate, $oneLine)`
	`1693`	`+ private function dumpServiceClosure(Reference $reference = null, $interpolate, $oneLine)`
`1694`	`1694`	`{`
`1695`	`1695`	`$code = $this->dumpValue($reference, $interpolate);`
`1696`	`1696`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,8 @@ protected function getFooServiceService()`
`88`	`88`	`return ${($_ = isset($this->services['bar_service']) ? $this->services['bar_service'] : $this->get('bar_service')) && false ?: '_'};`
`89`	`89`	`}, 'baz' => function () {`
`90`	`90`	`$f = function (\stdClass $v) { return $v; }; return $f(${($_ = isset($this->services['baz_service']) ? $this->services['baz_service'] : $this->getBazServiceService()) && false ?: '_'});`
	`91`	`+ }, 'nil' => function () {`
	`92`	`+ return NULL;`
`91`	`93`	`}));`
`92`	`94`	`}`
`93`	`95`