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

Robin Chalas · Robin Chalas · commit bda7e6632473 · 2018-12-01T20:32:30.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1621,6 +1621,8 @@ private function getServiceCall(string $id, Reference $reference = null): string
             return '$this';
         }
 
+        $trivial = false;
+
         if ($this->container->hasDefinition($id) && $definition = $this->container->getDefinition($id)) {
             if ($definition->isSynthetic()) {
                 $code = sprintf('$this->get(\'%s\'%s)', $id, null !== $reference ? ', '.$reference->getInvalidBehavior() : '');
@@ -1629,7 +1631,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 +1652,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) {
+                $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
`@@ -1621,6 +1621,8 @@ private function getServiceCall(string $id, Reference $reference = null): string`
`1621`	`1621`	`return '$this';`
`1622`	`1622`	`}`
`1623`	`1623`
	`1624`	`+ $trivial = false;`
	`1625`	`+`
`1624`	`1626`	`if ($this->container->hasDefinition($id) && $definition = $this->container->getDefinition($id)) {`
`1625`	`1627`	`if ($definition->isSynthetic()) {`
`1626`	`1628`	`$code = sprintf('$this->get(\'%s\'%s)', $id, null !== $reference ? ', '.$reference->getInvalidBehavior() : '');`
`@@ -1629,7 +1631,7 @@ private function getServiceCall(string $id, Reference $reference = null): string`
`1629`	`1631`	`if (!$definition->isShared()) {`
`1630`	`1632`	`return $code;`
`1631`	`1633`	`}`
`1632`		`- } elseif ($this->isTrivialInstance($definition)) {`
	`1634`	`+ } elseif ($trivial = $this->isTrivialInstance($definition)) {`
`1633`	`1635`	`if ($e = $definition->getErrors()) {`
`1634`	`1636`	`$this->addThrow = true;`
`1635`	`1637`
`@@ -1650,6 +1652,8 @@ private function getServiceCall(string $id, Reference $reference = null): string`
`1650`	`1652`	`}`
`1651`	`1653`	`if ($definition->isShared() && !isset($this->singleUsePrivateIds[$id])) {`
`1652`	`1654`	`$code = sprintf('($this->%s[\'%s\'] ?? %s)', $definition->isPublic() ? 'services' : 'privates', $id, $code);`
	`1655`	`+ } elseif ($trivial) {`
	`1656`	`+ $code = "($code)";`
`1653`	`1657`	`}`
`1654`	`1658`
`1655`	`1659`	`return $code;`
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`	`}`