bug #21942 [DI] Fix dumping null ServiceClosureArgument (nicolas-grekas)

This PR was merged into the 3.3-dev branch. Discussion ---------- [DI] Fix dumping null ServiceClosureArgument | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21941 | License | MIT | Doc PR | - Commits ------- 35977fd [DI] Fix dumping null ServiceClosureArgument
symfony · Mar 9, 2017 · 5b1a96a · 5b1a96a
2 parents 7f6f402 + 35977fd
commit 5b1a96a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
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;
         }));
     }