[7.0] Remove remaining deprecated code paths

Author: nicolas-grekas

CHANGELOG.md

@@ -8,7 +8,7 @@ CHANGELOG
  * Remove `ProxyHelper`, use `Symfony\Component\VarExporter\ProxyHelper` instead
  * Remove `ReferenceSetArgumentTrait`
  * Remove support of `@required` annotation, use the `Symfony\Contracts\Service\Attribute\Required` attribute instead
- * Passing `null` to `ContainerAwareTrait::setContainer()` must be done explicitly
+ * Require explicit argument when calling `ContainerAwareTrait::setContainer()`
  * Remove `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`, use options `inline_factories` and `inline_class_loader` instead
  * Parameter names of `ParameterBag` cannot be numerics
  * Remove `ContainerAwareInterface` and `ContainerAwareTrait`, use dependency injection instead

Compiler/RegisterServiceSubscribersPass.php

@@ -12,14 +12,12 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Psr\Container\ContainerInterface as PsrContainerInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\TypedReference;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Contracts\Service\Attribute\SubscribedService;
 use Symfony\Contracts\Service\ServiceProviderInterface;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
@@ -71,8 +69,6 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
             throw new InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $this->currentId, ServiceSubscriberInterface::class));
         }
         $class = $r->name;
-        // to remove when symfony/dependency-injection will stop being compatible with symfony/framework-bundle<6.0
-        $replaceDeprecatedSession = $this->container->has('.session.deprecated') && $r->isSubclassOf(AbstractController::class);
         $subscriberMap = [];
 
         foreach ($class::getSubscribedServices() as $key => $type) {
@@ -99,11 +95,6 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
                 if (!$autowire) {
                     throw new InvalidArgumentException(sprintf('Service "%s" misses a "container.service_subscriber" tag with "key"/"id" attributes corresponding to entry "%s" as returned by "%s::getSubscribedServices()".', $this->currentId, $key, $class));
                 }
-                if ($replaceDeprecatedSession && SessionInterface::class === $type) {
-                    // This prevents triggering the deprecation when building the container
-                    // to remove when symfony/dependency-injection will stop being compatible with symfony/framework-bundle<6.0
-                    $type = '.session.deprecated';
-                }
                 $serviceMap[$key] = new Reference($type);
             }
 

Tests/Compiler/ResolveBindingsPassTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
@@ -38,8 +37,6 @@
 
 class ResolveBindingsPassTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     public function testProcess()
     {
         $container = new ContainerBuilder();