bug #26400 [Config] ReflectionClassResource check abstract class (andrey1s)

fabpot · fabpot · commit f77db058954d · 2018-03-13T07:22:24.000-05:00
This PR was merged into the 3.4 branch. Discussion ---------- [Config] ReflectionClassResource check abstract class generate Signature update hash methods `ServiceSubscriberInterface::getSubscribedServices` and `EventSubscriberInterface::getSubscribedEvents` if the class is not abstract | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #26459, #26501 | License | MIT Commits ------- e851514 [Config] ReflectionClassResource check abstract ServiceSubscriberInterface and EventSubscriberInterface
diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -155,12 +155,16 @@ private function generateSignature(\ReflectionClass $class)
             }
         }
 
-        if ($class->isSubclassOf(EventSubscriberInterface::class)) {
+        if ($class->isAbstract() || $class->isInterface() || $class->isTrait()) {
+            return;
+        }
+
+        if (interface_exists(EventSubscriberInterface::class, false) && $class->isSubclassOf(EventSubscriberInterface::class)) {
             yield EventSubscriberInterface::class;
             yield print_r(\call_user_func(array($class->name, 'getSubscribedEvents')), true);
         }
 
-        if ($class->isSubclassOf(ServiceSubscriberInterface::class)) {
+        if (interface_exists(ServiceSubscriberInterface::class, false) && $class->isSubclassOf(ServiceSubscriberInterface::class)) {
             yield ServiceSubscriberInterface::class;
             yield print_r(\call_user_func(array($class->name, 'getSubscribedServices')), true);
         }

Original file line number	Diff line number	Diff line change
`@@ -155,12 +155,16 @@ private function generateSignature(\ReflectionClass $class)`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
`158`		`- if ($class->isSubclassOf(EventSubscriberInterface::class)) {`
	`158`	`+ if ($class->isAbstract() \|\| $class->isInterface() \|\| $class->isTrait()) {`
	`159`	`+ return;`
	`160`	`+ }`
	`161`	`+`
	`162`	`+ if (interface_exists(EventSubscriberInterface::class, false) && $class->isSubclassOf(EventSubscriberInterface::class)) {`
`159`	`163`	`yield EventSubscriberInterface::class;`
`160`	`164`	`yield print_r(\call_user_func(array($class->name, 'getSubscribedEvents')), true);`
`161`	`165`	`}`
`162`	`166`
`163`		`- if ($class->isSubclassOf(ServiceSubscriberInterface::class)) {`
	`167`	`+ if (interface_exists(ServiceSubscriberInterface::class, false) && $class->isSubclassOf(ServiceSubscriberInterface::class)) {`
`164`	`168`	`yield ServiceSubscriberInterface::class;`
`165`	`169`	`yield print_r(\call_user_func(array($class->name, 'getSubscribedServices')), true);`
`166`	`170`	`}`