[Contracts] Fix setting $container before calling parent::setContainer in ServiceSubscriberTrait

Author: Evan Shaw

src/Symfony/Contracts/Service/ServiceSubscriberTrait.php

@@ -98,12 +98,13 @@ public static function getSubscribedServices(): array
      */
     public function setContainer(ContainerInterface $container)
     {
-        $this->container = $container;
-
+        $ret = null;
         if (method_exists(get_parent_class(self::class) ?: '', __FUNCTION__)) {
-            return parent::setContainer($container);
+            $ret = parent::setContainer($container);
         }
 
-        return null;
+        $this->container = $container;
+
+        return $ret;
     }
 }

src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php

@@ -81,6 +81,18 @@ public function testParentNotCalledIfNoParent()
         $this->assertSame([], $service::getSubscribedServices());
     }
 
+    public function testSetContainerCalledFirstOnParent()
+    {
+        $container1 = new class([]) implements ContainerInterface {
+            use ServiceLocatorTrait;
+        };
+        $container2 = clone $container1;
+
+        $testService = new TestService2();
+        $this->assertNull($testService->setContainer($container1));
+        $this->assertSame($container1, $testService->setContainer($container2));
+    }
+
     /**
      * @requires PHP 8
      *
@@ -161,3 +173,22 @@ public static function __callStatic($method, $args)
 class Service3
 {
 }
+
+class ParentTestService2
+{
+    /** @var ContainerInterface */
+    protected $container;
+
+    public function setContainer(ContainerInterface $container)
+    {
+        $previous = $this->container;
+        $this->container = $container;
+
+        return $previous;
+    }
+}
+
+class TestService2 extends ParentTestService2 implements ServiceSubscriberInterface
+{
+    use ServiceSubscriberTrait;
+}