Merge branch '5.4' into 6.0

* 5.4:
  [Notifier] composer.json cleanup
  [HttpKernel] AbstractSessionListener should not override the cache lifetime for private responses
  [DependencyInjection] Shared private services becomes public after a public service is accessed
  [DI] Fix undefined class in test

Author: nicolas-grekas

ContainerBuilder.php

@@ -505,8 +505,8 @@ public function has(string $id): bool
      */
     public function get(string $id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE): ?object
     {
-        if ($this->isCompiled() && isset($this->removedIds[$id]) && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $invalidBehavior) {
-            return parent::get($id);
+        if ($this->isCompiled() && isset($this->removedIds[$id])) {
+            return ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $invalidBehavior ? parent::get($id) : null;
         }
 
         return $this->doGet($id, $invalidBehavior);
@@ -523,9 +523,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) {
@@ -1018,8 +1018,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) {
@@ -1575,7 +1575,11 @@ private function shareService(Definition $definition, mixed $service, ?string $i
         $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]);
         }
     }

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);
     }
 }

Tests/Compiler/ServiceLocatorTagPassTest.php

@@ -184,19 +184,19 @@ public function testIndexedByServiceIdWithDecoration()
 
         $container->setDefinition(Service::class, $service);
 
-        $decorated = new Definition(Decorated::class);
+        $decorated = new Definition(DecoratedService::class);
         $decorated->setPublic(true);
         $decorated->setDecoratedService(Service::class);
 
-        $container->setDefinition(Decorated::class, $decorated);
+        $container->setDefinition(DecoratedService::class, $decorated);
 
         $container->compile();
 
         /** @var ServiceLocator $locator */
         $locator = $container->get(Locator::class)->locator;
         static::assertTrue($locator->has(Service::class));
-        static::assertFalse($locator->has(Decorated::class));
-        static::assertInstanceOf(Decorated::class, $locator->get(Service::class));
+        static::assertFalse($locator->has(DecoratedService::class));
+        static::assertInstanceOf(DecoratedService::class, $locator->get(Service::class));
     }
 
     public function testDefinitionOrderIsTheSame()

Tests/ContainerBuilderTest.php

@@ -1066,10 +1066,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()