[DependencyInjection] remove ServiceSubscriberTrait deprecation layer

Author: kbond

Tests/Compiler/RegisterServiceSubscribersPassTest.php

@@ -24,8 +24,6 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
-use Symfony\Component\DependencyInjection\Tests\Fixtures\LegacyTestServiceSubscriberChild;
-use Symfony\Component\DependencyInjection\Tests\Fixtures\LegacyTestServiceSubscriberParent;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition1;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition2;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition3;
@@ -146,67 +144,6 @@ public function testExtraServiceSubscriber()
         $container->compile();
     }
 
-    /**
-     * @group legacy
-     */
-    public function testServiceSubscriberTrait()
-    {
-        $container = new ContainerBuilder();
-
-        $container->register('foo', LegacyTestServiceSubscriberChild::class)
-            ->addMethodCall('setContainer', [new Reference(PsrContainerInterface::class)])
-            ->addTag('container.service_subscriber')
-        ;
-
-        (new RegisterServiceSubscribersPass())->process($container);
-        (new ResolveServiceSubscribersPass())->process($container);
-
-        $foo = $container->getDefinition('foo');
-        $locator = $container->getDefinition((string) $foo->getMethodCalls()[0][1][0]);
-
-        $expected = [
-            LegacyTestServiceSubscriberChild::class.'::invalidDefinition' => new ServiceClosureArgument(new TypedReference('Symfony\Component\DependencyInjection\Tests\Fixtures\InvalidDefinition', 'Symfony\Component\DependencyInjection\Tests\Fixtures\InvalidDefinition', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)),
-            LegacyTestServiceSubscriberChild::class.'::testDefinition2' => new ServiceClosureArgument(new TypedReference(TestDefinition2::class, TestDefinition2::class, ContainerInterface::IGNORE_ON_INVALID_REFERENCE)),
-            LegacyTestServiceSubscriberChild::class.'::testDefinition3' => new ServiceClosureArgument(new TypedReference(TestDefinition3::class, TestDefinition3::class, ContainerInterface::IGNORE_ON_INVALID_REFERENCE)),
-            LegacyTestServiceSubscriberParent::class.'::testDefinition1' => new ServiceClosureArgument(new TypedReference(TestDefinition1::class, TestDefinition1::class, ContainerInterface::IGNORE_ON_INVALID_REFERENCE)),
-        ];
-
-        $this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testServiceSubscriberTraitWithGetter()
-    {
-        $container = new ContainerBuilder();
-
-        $subscriber = new class() implements ServiceSubscriberInterface {
-            use ServiceSubscriberTrait;
-
-            public function getFoo(): \stdClass
-            {
-            }
-        };
-        $container->register('foo', \get_class($subscriber))
-            ->addMethodCall('setContainer', [new Reference(PsrContainerInterface::class)])
-            ->addTag('container.service_subscriber');
-
-        (new RegisterServiceSubscribersPass())->process($container);
-        (new ResolveServiceSubscribersPass())->process($container);
-
-        $foo = $container->getDefinition('foo');
-        $locator = $container->getDefinition((string) $foo->getMethodCalls()[0][1][0]);
-
-        $expected = [
-            \get_class($subscriber).'::getFoo' => new ServiceClosureArgument(new TypedReference('stdClass', 'stdClass', ContainerInterface::IGNORE_ON_INVALID_REFERENCE, 'foo')),
-        ];
-        $this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
-    }
-
-    /**
-     * @requires PHP 8
-     */
     public function testServiceSubscriberTraitWithSubscribedServiceAttribute()
     {
         if (!class_exists(SubscribedService::class)) {
@@ -237,9 +174,6 @@ public function testServiceSubscriberTraitWithSubscribedServiceAttribute()
         $this->assertEquals($expected, $container->getDefinition((string) $locator->getFactory()[0])->getArgument(0));
     }
 
-    /**
-     * @requires PHP 8
-     */
     public function testServiceSubscriberTraitWithSubscribedServiceAttributeOnStaticMethod()
     {
         if (!class_exists(SubscribedService::class)) {
@@ -260,9 +194,6 @@ public static function method(): TestDefinition1
         $subscriber::getSubscribedServices();
     }
 
-    /**
-     * @requires PHP 8
-     */
     public function testServiceSubscriberTraitWithSubscribedServiceAttributeOnMethodWithRequiredParameters()
     {
         if (!class_exists(SubscribedService::class)) {
@@ -283,9 +214,6 @@ public function method($param1, $param2 = null): TestDefinition1
         $subscriber::getSubscribedServices();
     }
 
-    /**
-     * @requires PHP 8
-     */
     public function testServiceSubscriberTraitWithSubscribedServiceAttributeOnMethodMissingReturnType()
     {
         if (!class_exists(SubscribedService::class)) {