[DependencyInjection] Shared private services becomes public after a public service is accessed

alexpott · nicolas-grekas · commit ece0c8913aed · 2022-12-15T11:29:34.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -546,8 +546,12 @@ public function has(string $id)
      */
     public function get(string $id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
     {
-        if ($this->isCompiled() && isset($this->removedIds[$id]) && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $invalidBehavior) {
-            return parent::get($id);
+        if ($this->isCompiled() && isset($this->removedIds[$id])) {
+            if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $invalidBehavior) {
+                return parent::get($id);
+            }
+
+            return null;
         }
 
         return $this->doGet($id, $invalidBehavior);
@@ -564,9 +568,9 @@ private function doGet(string $id, int $invalidBehavior = ContainerInterface::EX
         }
         try {
             if (ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $invalidBehavior) {
-                return parent::get($id, $invalidBehavior);
+                return $this->privates[$id] ?? parent::get($id, $invalidBehavior);
             }
-            if ($service = parent::get($id, ContainerInterface::NULL_ON_INVALID_REFERENCE)) {
+            if (null !== $service = $this->privates[$id] ?? parent::get($id, ContainerInterface::NULL_ON_INVALID_REFERENCE)) {
                 return $service;
             }
         } catch (ServiceCircularReferenceException $e) {
@@ -1085,8 +1089,8 @@ private function createService(Definition $definition, array &$inlineServices, b
             }
         }
 
-        if (null !== $id && $definition->isShared() && isset($this->services[$id]) && ($tryProxy || !$definition->isLazy())) {
-            return $this->services[$id];
+        if (null !== $id && $definition->isShared() && (isset($this->services[$id]) || isset($this->privates[$id])) && ($tryProxy || !$definition->isLazy())) {
+            return $this->services[$id] ?? $this->privates[$id];
         }
 
         if (null !== $factory) {
@@ -1665,7 +1669,11 @@ private function shareService(Definition $definition, $service, ?string $id, arr
         $inlineServices[$id ?? spl_object_hash($definition)] = $service;
 
         if (null !== $id && $definition->isShared()) {
-            $this->services[$id] = $service;
+            if ($definition->isPrivate() && $this->isCompiled()) {
+                $this->privates[$id] = $service;
+            } else {
+                $this->services[$id] = $service;
+            }
             unset($this->loading[$id]);
         }
     }
diff --git a/src/Symfony/Component/DependencyInjection/ReverseContainer.php b/src/Symfony/Component/DependencyInjection/ReverseContainer.php
@@ -63,10 +63,6 @@ public function getId(object $service): ?string
      */
     public function getService(string $id): object
     {
-        if ($this->serviceContainer->has($id)) {
-            return $this->serviceContainer->get($id);
-        }
-
         if ($this->reversibleLocator->has($id)) {
             return $this->reversibleLocator->get($id);
         }
@@ -75,7 +71,6 @@ public function getService(string $id): object
             throw new ServiceNotFoundException($id, null, null, [], sprintf('The "%s" service is private and cannot be accessed by reference. You should either make it public, or tag it as "%s".', $id, $this->tagName));
         }
 
-        // will throw a ServiceNotFoundException
-        $this->serviceContainer->get($id);
+        return $this->serviceContainer->get($id);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -1105,10 +1105,19 @@ public function testPrivateServiceUser()
         $container->addDefinitions([
             'bar' => $fooDefinition,
             'bar_user' => $fooUserDefinition->setPublic(true),
+            'bar_user2' => $fooUserDefinition->setPublic(true),
         ]);
 
         $container->compile();
+        $this->assertNull($container->get('bar', $container::NULL_ON_INVALID_REFERENCE));
         $this->assertInstanceOf(\BarClass::class, $container->get('bar_user')->bar);
+
+        // Ensure that accessing a public service with a shared private service
+        // does not make the private service available.
+        $this->assertNull($container->get('bar', $container::NULL_ON_INVALID_REFERENCE));
+
+        // Ensure the private service is still shared.
+        $this->assertSame($container->get('bar_user')->bar, $container->get('bar_user2')->bar);
     }
 
     public function testThrowsExceptionWhenSetServiceOnACompiledContainer()

Original file line number	Diff line number	Diff line change
`@@ -546,8 +546,12 @@ public function has(string $id)`
`546`	`546`	`*/`
`547`	`547`	`public function get(string $id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)`
`548`	`548`	`{`
`549`		`- if ($this->isCompiled() && isset($this->removedIds[$id]) && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $invalidBehavior) {`
`550`		`- return parent::get($id);`
	`549`	`+ if ($this->isCompiled() && isset($this->removedIds[$id])) {`
	`550`	`+ if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $invalidBehavior) {`
	`551`	`+ return parent::get($id);`
	`552`	`+ }`
	`553`	`+`
	`554`	`+ return null;`
`551`	`555`	`}`
`552`	`556`
`553`	`557`	`return $this->doGet($id, $invalidBehavior);`
`@@ -564,9 +568,9 @@ private function doGet(string $id, int $invalidBehavior = ContainerInterface::EX`
`564`	`568`	`}`
`565`	`569`	`try {`
`566`	`570`	`if (ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $invalidBehavior) {`
`567`		`- return parent::get($id, $invalidBehavior);`
	`571`	`+ return $this->privates[$id] ?? parent::get($id, $invalidBehavior);`
`568`	`572`	`}`
`569`		`- if ($service = parent::get($id, ContainerInterface::NULL_ON_INVALID_REFERENCE)) {`
	`573`	`+ if (null !== $service = $this->privates[$id] ?? parent::get($id, ContainerInterface::NULL_ON_INVALID_REFERENCE)) {`
`570`	`574`	`return $service;`
`571`	`575`	`}`
`572`	`576`	`} catch (ServiceCircularReferenceException $e) {`
`@@ -1085,8 +1089,8 @@ private function createService(Definition $definition, array &$inlineServices, b`
`1085`	`1089`	`}`
`1086`	`1090`	`}`
`1087`	`1091`
`1088`		`- if (null !== $id && $definition->isShared() && isset($this->services[$id]) && ($tryProxy \|\| !$definition->isLazy())) {`
`1089`		`- return $this->services[$id];`
	`1092`	`+ if (null !== $id && $definition->isShared() && (isset($this->services[$id]) \|\| isset($this->privates[$id])) && ($tryProxy \|\| !$definition->isLazy())) {`
	`1093`	`+ return $this->services[$id] ?? $this->privates[$id];`
`1090`	`1094`	`}`
`1091`	`1095`
`1092`	`1096`	`if (null !== $factory) {`
`@@ -1665,7 +1669,11 @@ private function shareService(Definition $definition, $service, ?string $id, arr`
`1665`	`1669`	`$inlineServices[$id ?? spl_object_hash($definition)] = $service;`
`1666`	`1670`
`1667`	`1671`	`if (null !== $id && $definition->isShared()) {`
`1668`		`- $this->services[$id] = $service;`
	`1672`	`+ if ($definition->isPrivate() && $this->isCompiled()) {`
	`1673`	`+ $this->privates[$id] = $service;`
	`1674`	`+ } else {`
	`1675`	`+ $this->services[$id] = $service;`
	`1676`	`+ }`
`1669`	`1677`	`unset($this->loading[$id]);`
`1670`	`1678`	`}`
`1671`	`1679`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,6 @@ public function getId(object $service): ?string`
`63`	`63`	`*/`
`64`	`64`	`public function getService(string $id): object`
`65`	`65`	`{`
`66`		`- if ($this->serviceContainer->has($id)) {`
`67`		`- return $this->serviceContainer->get($id);`
`68`		`- }`
`69`		`-`
`70`	`66`	`if ($this->reversibleLocator->has($id)) {`
`71`	`67`	`return $this->reversibleLocator->get($id);`
`72`	`68`	`}`
`@@ -75,7 +71,6 @@ public function getService(string $id): object`
`75`	`71`	`throw new ServiceNotFoundException($id, null, null, [], sprintf('The "%s" service is private and cannot be accessed by reference. You should either make it public, or tag it as "%s".', $id, $this->tagName));`
`76`	`72`	`}`
`77`	`73`
`78`		`- // will throw a ServiceNotFoundException`
`79`		`- $this->serviceContainer->get($id);`
	`74`	`+ return $this->serviceContainer->get($id);`
`80`	`75`	`}`
`81`	`76`	`}`