bug #45677 [DependencyInjection] fix ServiceSubscriberTrait bug where parent has __call() (kbond)

fabpot · fabpot · commit ab136f07aae9 · 2022-03-09T18:53:12.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [DependencyInjection] fix `ServiceSubscriberTrait` bug where parent has `__call()` | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | n/a | License | MIT | Doc PR | n/a `is_callable(['parent', __FUNCTION__])` is true if the parent has magic `__call()/__callStatic` methods. Discovered this when trying to use `ServiceSubscriberTrait` with a Doctrine `ServiceEntityRepository`. Commits ------- 4b8cd52 [DI] fix `ServiceSubscriberTrait` bug where parent has `__call()`
diff --git a/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php b/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php
@@ -35,7 +35,7 @@ public static function getSubscribedServices(): array
             return $services;
         }
 
-        $services = \is_callable(['parent', __FUNCTION__]) ? parent::getSubscribedServices() : [];
+        $services = method_exists(get_parent_class(self::class) ?: '', __FUNCTION__) ? parent::getSubscribedServices() : [];
 
         foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
             if ($method->isStatic() || $method->isAbstract() || $method->isGenerator() || $method->isInternal() || $method->getNumberOfRequiredParameters()) {
@@ -69,7 +69,7 @@ public function setContainer(ContainerInterface $container)
     {
         $this->container = $container;
 
-        if (\is_callable(['parent', __FUNCTION__])) {
+        if (method_exists(get_parent_class(self::class) ?: '', __FUNCTION__)) {
             return parent::setContainer($container);
         }
 
diff --git a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
@@ -36,6 +36,32 @@ public function testSetContainerIsCalledOnParent()
         $this->assertSame($container, (new TestService())->setContainer($container));
     }
 
+    public function testParentNotCalledIfHasMagicCall()
+    {
+        $container = new class([]) implements ContainerInterface {
+            use ServiceLocatorTrait;
+        };
+        $service = new class() extends ParentWithMagicCall {
+            use ServiceSubscriberTrait;
+        };
+
+        $this->assertNull($service->setContainer($container));
+        $this->assertSame([], $service::getSubscribedServices());
+    }
+
+    public function testParentNotCalledIfNoParent()
+    {
+        $container = new class([]) implements ContainerInterface {
+            use ServiceLocatorTrait;
+        };
+        $service = new class() {
+            use ServiceSubscriberTrait;
+        };
+
+        $this->assertNull($service->setContainer($container));
+        $this->assertSame([], $service::getSubscribedServices());
+    }
+
     /**
      * @requires PHP 8
      */
@@ -77,3 +103,16 @@ public function aChildService(): Service3
     {
     }
 }
+
+class ParentWithMagicCall
+{
+    public function __call($method, $args)
+    {
+        throw new \BadMethodCallException('Should not be called.');
+    }
+
+    public static function __callStatic($method, $args)
+    {
+        throw new \BadMethodCallException('Should not be called.');
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static function getSubscribedServices(): array`
`35`	`35`	`return $services;`
`36`	`36`	`}`
`37`	`37`
`38`		`- $services = \is_callable(['parent', __FUNCTION__]) ? parent::getSubscribedServices() : [];`
	`38`	`+ $services = method_exists(get_parent_class(self::class) ?: '', __FUNCTION__) ? parent::getSubscribedServices() : [];`
`39`	`39`
`40`	`40`	`foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {`
`41`	`41`	`if ($method->isStatic() \|\| $method->isAbstract() \|\| $method->isGenerator() \|\| $method->isInternal() \|\| $method->getNumberOfRequiredParameters()) {`
`@@ -69,7 +69,7 @@ public function setContainer(ContainerInterface $container)`
`69`	`69`	`{`
`70`	`70`	`$this->container = $container;`
`71`	`71`
`72`		`- if (\is_callable(['parent', __FUNCTION__])) {`
	`72`	`+ if (method_exists(get_parent_class(self::class) ?: '', __FUNCTION__)) {`
`73`	`73`	`return parent::setContainer($container);`
`74`	`74`	`}`
`75`	`75`