symfony
diff --git a/‎UPGRADE-5.4.md
Copy file name to clipboardExpand all lines: UPGRADE-5.4.md
+1-1Lines changed: 1 addition & 1 deletion b/‎UPGRADE-5.4.md
Copy file name to clipboardExpand all lines: UPGRADE-5.4.md
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/CHANGELOG.md
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpKernel/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/CHANGELOG.md
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
+3-5Lines changed: 3 additions & 5 deletions b/‎src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
+3-5Lines changed: 3 additions & 5 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php
+3-6Lines changed: 3 additions & 6 deletions b/‎src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php
+3-6Lines changed: 3 additions & 6 deletions
@@ -43,7 +43,7 @@ FrameworkBundle
 HttpKernel
 ----------
 
- * Deprecate `AbstractTestSessionListener::getSession` inject a session in the request instead
+ * Deprecate `AbstractTestSessionListener` and `TestSessionListener`, use `AbstractSessionListener` and `SessionListener` instead
 
 HttpFoundation
 --------------
 
@@ -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
 
@@ -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();
 
@@ -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');
         }
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`	`use Symfony\Component\HttpKernel\Event\ResponseEvent;`
`20`	`20`	`use Symfony\Component\HttpKernel\KernelEvents;`
`21`	`21`
	`22`	`+trigger_deprecation('symfony/http-kernel', '5.4', '"%s" is deprecated use "%s" instead.', AbstractTestSessionListener::class, AbstractSessionListener::class);`
	`23`	`+`
`22`	`24`	`/**`
`23`	`25`	`* TestSessionListener.`
`24`	`26`	`*`
`@@ -29,7 +31,7 @@`
`29`	`31`	`*`
`30`	`32`	`* @internal`
`31`	`33`	`*`
`32`		`- * @deprecated the TestSessionListener use the default SessionListener instead`
	`34`	`+ * @deprecated since Symfony 5.4, use AbstractSessionListener instead`
`33`	`35`	`*/`
`34`	`36`	`abstract class AbstractTestSessionListener implements EventSubscriberInterface`
`35`	`37`	`{`
`@@ -39,8 +41,6 @@ abstract class AbstractTestSessionListener implements EventSubscriberInterface`
`39`	`41`	`public function __construct(array $sessionOptions = [])`
`40`	`42`	`{`
`41`	`43`	`$this->sessionOptions = $sessionOptions;`
`42`		`-`
`43`		`- trigger_deprecation('symfony/http-kernel', '5.4', 'The %s is deprecated use the %s instead.', __CLASS__, AbstractSessionListener::class);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public function onKernelRequest(RequestEvent $event)`
`@@ -114,8 +114,6 @@ public static function getSubscribedEvents(): array`
`114`	`114`	`/**`
`115`	`115`	`* Gets the session object.`
`116`	`116`	`*`
`117`		`- * @deprecated since Symfony 5.4, will be removed in 6.0.`
`118`		`- *`
`119`	`117`	`* @return SessionInterface\|null`
`120`	`118`	`*/`
`121`	`119`	`abstract protected function getSession();`
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,16 @@`
`14`	`14`	`use Psr\Container\ContainerInterface;`
`15`	`15`	`use Symfony\Component\HttpFoundation\Session\SessionInterface;`
`16`	`16`
	`17`	`+trigger_deprecation('symfony/http-kernel', '5.4', '"%s" is deprecated, use "%s" instead.', TestSessionListener::class, SessionListener::class);`
	`18`	`+`
`17`	`19`	`/**`
`18`	`20`	`* Sets the session in the request.`
`19`	`21`	`*`
`20`	`22`	`* @author Fabien Potencier <fabien@symfony.com>`
`21`	`23`	`*`
`22`	`24`	`* @final`
`23`	`25`	`*`
`24`		`- * @deprecated the TestSessionListener use the default SessionListener instead`
	`26`	`+ * @deprecated since Symfony 5.4, use SessionListener instead`
`25`	`27`	`*/`
`26`	`28`	`class TestSessionListener extends AbstractTestSessionListener`
`27`	`29`	`{`
`@@ -33,13 +35,8 @@ public function __construct(ContainerInterface $container, array $sessionOptions`
`33`	`35`	`parent::__construct($sessionOptions);`
`34`	`36`	`}`
`35`	`37`
`36`		`- /**`
`37`		`- * @deprecated since Symfony 5.4, will be removed in 6.0.`
`38`		`- */`
`39`	`38`	`protected function getSession(): ?SessionInterface`
`40`	`39`	`{`
`41`		`- 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__);`
`42`		`-`
`43`	`40`	`if ($this->container->has('session')) {`
`44`	`41`	`return $this->container->get('session');`
`45`	`42`	`}`