[DI] Fix dumping expressions accessing single-use private services

Robin Chalas · Robin Chalas · commit 0d12d934e354 · 2018-12-01T20:55:59.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -595,11 +595,8 @@ private function addServiceConfigurator(Definition $definition, string $variable
 
         if (\is_array($callable)) {
             if ($callable[0] instanceof Reference
-                || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))
-            ) {
-                $callable[0] = $this->dumpValue($callable[0]);
-
-                return sprintf('        '.('$' === $callable[0][0] ? '%s' : '(%s)')."->%s(\$%s);\n", $callable[0], $callable[1], $variableName);
+                || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))) {
+                return sprintf("        %s->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
             }
 
             $class = $this->dumpValue($callable[0]);
@@ -1629,7 +1626,7 @@ private function getServiceCall(string $id, Reference $reference = null): string
                 if (!$definition->isShared()) {
                     return $code;
                 }
-            } elseif ($this->isTrivialInstance($definition)) {
+            } elseif ($trivial = $this->isTrivialInstance($definition)) {
                 if ($e = $definition->getErrors()) {
                     $this->addThrow = true;
 
@@ -1650,6 +1647,8 @@ private function getServiceCall(string $id, Reference $reference = null): string
             }
             if ($definition->isShared() && !isset($this->singleUsePrivateIds[$id])) {
                 $code = sprintf('($this->%s[\'%s\'] ?? %s)', $definition->isPublic() ? 'services' : 'privates', $id, $code);
+            } elseif ($trivial ?? false) {
+                $code = "($code)";
             }
 
             return $code;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -799,7 +799,7 @@ public function testExpressionReferencingPrivateService()
             ->setPublic(false);
         $container->register('public_foo', 'stdClass')
             ->setPublic(true)
-            ->addArgument(new Expression('service("private_foo")'));
+            ->addArgument(new Expression('service("private_foo").bar'));
 
         $container->compile();
         $dumper = new PhpDumper($container);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_private_in_expression.php
@@ -56,6 +56,6 @@ public function getRemovedIds()
      */
     protected function getPublicFooService()
     {
-        return $this->services['public_foo'] = new \stdClass(new \stdClass());
+        return $this->services['public_foo'] = new \stdClass((new \stdClass())->bar);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,6 @@ public function getRemovedIds()`
`56`	`56`	`*/`
`57`	`57`	`protected function getPublicFooService()`
`58`	`58`	`{`
`59`		`- return $this->services['public_foo'] = new \stdClass(new \stdClass());`
	`59`	`+ return $this->services['public_foo'] = new \stdClass((new \stdClass())->bar);`
`60`	`60`	`}`
`61`	`61`	`}`