[HttpKernel] Fix advertizing deprecations for *TestSessionListener

Author: nicolas-grekas

CHANGELOG.md

@@ -5,7 +5,7 @@ CHANGELOG
 ---
 
  * Add the ability to enable the profiler using a request query parameter, body parameter or attribute
- * Deprecate `AbstractTestSessionListener::getSession` inject a session in the request instead
+ * Deprecate `AbstractTestSessionListener` and `TestSessionListener`, use `AbstractSessionListener` and `SessionListener` instead
  * Deprecate the `fileLinkFormat` parameter of `DebugHandlersListener`
  * Add support for configuring log level, and status code by exception class
  * Allow ignoring "kernel.reset" methods that don't exist with "on_invalid" attribute

EventListener/AbstractTestSessionListener.php

@@ -19,6 +19,8 @@
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
+trigger_deprecation('symfony/http-kernel', '5.4', '"%s" is deprecated use "%s" instead.', AbstractTestSessionListener::class, AbstractSessionListener::class);
+
 /**
  * TestSessionListener.
  *
@@ -29,7 +31,7 @@
  *
  * @internal
  *
- * @deprecated the TestSessionListener use the default SessionListener instead
+ * @deprecated since Symfony 5.4, use AbstractSessionListener instead
  */
 abstract class AbstractTestSessionListener implements EventSubscriberInterface
 {
@@ -39,8 +41,6 @@ abstract class AbstractTestSessionListener implements EventSubscriberInterface
     public function __construct(array $sessionOptions = [])
     {
         $this->sessionOptions = $sessionOptions;
-
-        trigger_deprecation('symfony/http-kernel', '5.4', 'The %s is deprecated use the %s instead.', __CLASS__, AbstractSessionListener::class);
     }
 
     public function onKernelRequest(RequestEvent $event)
@@ -114,8 +114,6 @@ public static function getSubscribedEvents(): array
     /**
      * Gets the session object.
      *
-     * @deprecated since Symfony 5.4, will be removed in 6.0.
-     *
      * @return SessionInterface|null
      */
     abstract protected function getSession();

EventListener/TestSessionListener.php

@@ -14,14 +14,16 @@
 use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
+trigger_deprecation('symfony/http-kernel', '5.4', '"%s" is deprecated, use "%s" instead.', TestSessionListener::class, SessionListener::class);
+
 /**
  * Sets the session in the request.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
  * @final
  *
- * @deprecated the TestSessionListener use the default SessionListener instead
+ * @deprecated since Symfony 5.4, use SessionListener instead
  */
 class TestSessionListener extends AbstractTestSessionListener
 {
@@ -33,13 +35,8 @@ public function __construct(ContainerInterface $container, array $sessionOptions
         parent::__construct($sessionOptions);
     }
 
-    /**
-     * @deprecated since Symfony 5.4, will be removed in 6.0.
-     */
     protected function getSession(): ?SessionInterface
     {
-        trigger_deprecation('symfony/http-kernel', '5.4', '"%s" is deprecated and will be removed in 6.0, inject a session in the request instead.', __METHOD__);
-
         if ($this->container->has('session')) {
             return $this->container->get('session');
         }