[DependencyInjection] remove ServiceSubscriberTrait deprecation layer

Author: kbond

Service/ServiceSubscriberTrait.php

@@ -37,61 +37,31 @@ public static function getSubscribedServices(): array
         }
 
         $services = \is_callable(['parent', __FUNCTION__]) ? parent::getSubscribedServices() : [];
-        $attributeOptIn = false;
 
-        if (\PHP_VERSION_ID >= 80000) {
-            foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
-                if (self::class !== $method->getDeclaringClass()->name) {
-                    continue;
-                }
-
-                if (!$attribute = $method->getAttributes(SubscribedService::class)[0] ?? null) {
-                    continue;
-                }
-
-                if ($method->isStatic() || $method->isAbstract() || $method->isGenerator() || $method->isInternal() || $method->getNumberOfRequiredParameters()) {
-                    throw new \LogicException(sprintf('Cannot use "%s" on method "%s::%s()" (can only be used on non-static, non-abstract methods with no parameters).', SubscribedService::class, self::class, $method->name));
-                }
-
-                if (!$returnType = $method->getReturnType()) {
-                    throw new \LogicException(sprintf('Cannot use "%s" on methods without a return type in "%s::%s()".', SubscribedService::class, $method->name, self::class));
-                }
-
-                $serviceId = $returnType instanceof \ReflectionNamedType ? $returnType->getName() : (string) $returnType;
-
-                if ($returnType->allowsNull()) {
-                    $serviceId = '?'.$serviceId;
-                }
-
-                $services[$attribute->newInstance()->key ?? self::class.'::'.$method->name] = $serviceId;
-                $attributeOptIn = true;
+        foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
+            if (self::class !== $method->getDeclaringClass()->name) {
+                continue;
             }
-        }
-
-        if (!$attributeOptIn) {
-            foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
-                if ($method->isStatic() || $method->isAbstract() || $method->isGenerator() || $method->isInternal() || $method->getNumberOfRequiredParameters()) {
-                    continue;
-                }
 
-                if (self::class !== $method->getDeclaringClass()->name) {
-                    continue;
-                }
+            if (!$attribute = $method->getAttributes(SubscribedService::class)[0] ?? null) {
+                continue;
+            }
 
-                if (!$returnType = $method->getReturnType()) {
-                    continue;
-                }
+            if ($method->isStatic() || $method->isAbstract() || $method->isGenerator() || $method->isInternal() || $method->getNumberOfRequiredParameters()) {
+                throw new \LogicException(sprintf('Cannot use "%s" on method "%s::%s()" (can only be used on non-static, non-abstract methods with no parameters).', SubscribedService::class, self::class, $method->name));
+            }
 
-                if ($returnType->isBuiltin()) {
-                    continue;
-                }
+            if (!$returnType = $method->getReturnType()) {
+                throw new \LogicException(sprintf('Cannot use "%s" on methods without a return type in "%s::%s()".', SubscribedService::class, $method->name, self::class));
+            }
 
-                if (\PHP_VERSION_ID >= 80000) {
-                    trigger_deprecation('symfony/service-contracts', '2.5', 'Using "%s" in "%s" without using the "%s" attribute on any method is deprecated.', ServiceSubscriberTrait::class, self::class, SubscribedService::class);
-                }
+            $serviceId = $returnType instanceof \ReflectionNamedType ? $returnType->getName() : (string) $returnType;
 
-                $services[self::class.'::'.$method->name] = '?'.($returnType instanceof \ReflectionNamedType ? $returnType->getName() : $returnType);
+            if ($returnType->allowsNull()) {
+                $serviceId = '?'.$serviceId;
             }
+
+            $services[$attribute->newInstance()->key ?? self::class.'::'.$method->name] = $serviceId;
         }
 
         return $services;

Tests/Service/ServiceSubscriberTraitTest.php

@@ -22,19 +22,6 @@
 
 class ServiceSubscriberTraitTest extends TestCase
 {
-    /**
-     * @group legacy
-     */
-    public function testLegacyMethodsOnParentsAndChildrenAreIgnoredInGetSubscribedServices()
-    {
-        $expected = [LegacyTestService::class.'::aService' => '?'.Service2::class];
-
-        $this->assertEquals($expected, LegacyChildTestService::getSubscribedServices());
-    }
-
-    /**
-     * @requires PHP 8
-     */
     public function testMethodsOnParentsAndChildrenAreIgnoredInGetSubscribedServices()
     {
         $expected = [
@@ -67,22 +54,6 @@ public function setContainer(ContainerInterface $container)
     }
 }
 
-class LegacyTestService extends ParentTestService implements ServiceSubscriberInterface
-{
-    use ServiceSubscriberTrait;
-
-    public function aService(): Service2
-    {
-    }
-}
-
-class LegacyChildTestService extends LegacyTestService
-{
-    public function aChildService(): Service3
-    {
-    }
-}
-
 class TestService extends ParentTestService implements ServiceSubscriberInterface
 {
     use ServiceSubscriberTrait;