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

Evan Shaw · nicolas-grekas · commit 1a3d2ddc2c06 · 2023-02-21T12:06:24.000+01:00
diff --git a/ServiceSubscriberTrait.php b/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;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -98,12 +98,13 @@ public static function getSubscribedServices(): array`
`98`	`98`	`*/`
`99`	`99`	`public function setContainer(ContainerInterface $container)`
`100`	`100`	`{`
`101`		`- $this->container = $container;`
`102`		`-`
	`101`	`+ $ret = null;`
`103`	`102`	`if (method_exists(get_parent_class(self::class) ?: '', __FUNCTION__)) {`
`104`		`- return parent::setContainer($container);`
	`103`	`+ $ret = parent::setContainer($container);`
`105`	`104`	`}`
`106`	`105`
`107`		`- return null;`
	`106`	`+ $this->container = $container;`
	`107`	`+`
	`108`	`+ return $ret;`
`108`	`109`	`}`
`109`	`110`	`}`