Improvide deprecation message for session

Author: jderusse

DependencyInjection/Compiler/SessionPass.php

@@ -26,20 +26,22 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        // BC layer: Make "session" an alias of ".session.do-not-use" when not overriden by the user
+        // BC layer: Make "session" an alias of ".session.do-not-use" when not overridden by the user
         if (!$container->has('session')) {
             $alias = $container->setAlias('session', '.session.do-not-use');
-            $alias->setDeprecated('symfony/framework-bundle', '5.3', 'The "%alias_id%" service is deprecated, use "$requestStack->getSession()" instead.');
+            $alias->setDeprecated('symfony/framework-bundle', '5.3', 'The "%alias_id%" service and "SessionInterface" alias are deprecated, use "$requestStack->getSession()" instead.');
+            // restore previous behavior
+            $alias->setPublic(true);
 
             return;
         }
 
         if ($container->hasDefinition('session')) {
             $definition = $container->getDefinition('session');
-            $definition->setDeprecated('symfony/framework-bundle', '5.3', 'The "%service_id%" service is deprecated, use "$requestStack->getSession()" instead.');
+            $definition->setDeprecated('symfony/framework-bundle', '5.3', 'The "%service_id%" service and "SessionInterface" alias are deprecated, use "$requestStack->getSession()" instead.');
         } else {
             $alias = $container->getAlias('session');
-            $alias->setDeprecated('symfony/framework-bundle', '5.3', 'The "%alias_id%" alias is deprecated, use "$requestStack->getSession()" instead.');
+            $alias->setDeprecated('symfony/framework-bundle', '5.3', 'The "%alias_id%" and "SessionInterface" aliases are deprecated, use "$requestStack->getSession()" instead.');
             $definition = $container->findDefinition('session');
         }
 

Resources/config/session.php

@@ -88,7 +88,7 @@
         ->set('.session.deprecated', SessionInterface::class) // to be removed in 6.0
             ->factory([inline_service(DeprecatedSessionFactory::class)->args([service('request_stack')]), 'getSession'])
         ->alias(SessionInterface::class, '.session.do-not-use')
-            ->deprecate('symfony/framework-bundle', '5.3', 'The "%alias_id%" alias is deprecated, use "$requestStack->getSession()" instead.')
+            ->deprecate('symfony/framework-bundle', '5.3', 'The "%alias_id%" and "SessionInterface" aliases are deprecated, use "$requestStack->getSession()" instead.')
         ->alias(SessionStorageInterface::class, 'session.storage')
             ->deprecate('symfony/framework-bundle', '5.3', 'The "%alias_id%" alias is deprecated, use "session.storage.factory" instead.')
         ->alias(\SessionHandlerInterface::class, 'session.handler')

Session/DeprecatedSessionFactory.php

@@ -35,7 +35,7 @@ public function __construct(RequestStack $requestStack)
 
     public function getSession(): ?SessionInterface
     {
-        trigger_deprecation('symfony/framework-bundle', '5.3', 'The "session" service is deprecated, use "$requestStack->getSession()" instead.');
+        trigger_deprecation('symfony/framework-bundle', '5.3', 'The "session" service and "SessionInterface" alias are deprecated, use "$requestStack->getSession()" instead.');
 
         try {
             return $this->requestStack->getSession();

Tests/Functional/SessionTest.php

@@ -105,7 +105,7 @@ public function testFlashOnInjectedFlashbag($config, $insulate)
      */
     public function testSessionServiceTriggerDeprecation($config, $insulate)
     {
-        $this->expectDeprecation('Since symfony/framework-bundle 5.3: The "session" service is deprecated, use "$requestStack->getSession()" instead.');
+        $this->expectDeprecation('Since symfony/framework-bundle 5.3: The "session" service and "SessionInterface" alias are deprecated, use "$requestStack->getSession()" instead.');
 
         $client = $this->createClient(['test_case' => 'Session', 'root_config' => $config]);
         if ($insulate) {