Fix annotations

nicolas-grekas · nicolas-grekas · commit be5f64130816 · 2019-06-08T08:23:28.000+02:00
diff --git a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php
@@ -20,7 +20,7 @@
  *
  * @author Christophe Coevoet <stof@notk.org>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class ChromePhpHandler extends BaseChromePhpHandler
 {
diff --git a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php
@@ -20,7 +20,7 @@
  *
  * @author Jordi Boggiano <j.boggiano@seld.be>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class FirePHPHandler extends BaseFirePHPHandler
 {
diff --git a/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php b/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php
@@ -20,7 +20,7 @@
  *
  * @author Philipp Kräutli <pkraeutli@astina.ch>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class SwiftMailerHandler extends BaseSwiftMailerHandler
 {
diff --git a/src/Symfony/Bridge/Monolog/Processor/RouteProcessor.php b/src/Symfony/Bridge/Monolog/Processor/RouteProcessor.php
@@ -22,7 +22,7 @@
  *
  * @author Piotr Stankowski <git@trakos.pl>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class RouteProcessor implements EventSubscriberInterface, ResetInterface
 {
diff --git a/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php b/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php
@@ -21,7 +21,7 @@
  *
  * @author Jordi Boggiano <j.boggiano@seld.be>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class WebProcessor extends BaseWebProcessor implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php b/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php
@@ -12,13 +12,13 @@
 namespace Symfony\Bundle\SecurityBundle\EventListener;
 
 use Symfony\Bundle\SecurityBundle\Security\FirewallMap;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Security\Http\Firewall;
 use Symfony\Component\Security\Http\FirewallMapInterface;
 use Symfony\Component\Security\Http\Logout\LogoutUrlGenerator;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
  * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
@@ -30,18 +30,13 @@ class FirewallListener extends Firewall
 
     public function __construct(FirewallMapInterface $map, EventDispatcherInterface $dispatcher, LogoutUrlGenerator $logoutUrlGenerator)
     {
-        // the type-hint will be updated to the "EventDispatcherInterface" from symfony/contracts in 5.0
-
         $this->map = $map;
         $this->logoutUrlGenerator = $logoutUrlGenerator;
 
         parent::__construct($map, $dispatcher);
     }
 
-    /**
-     * @internal
-     */
-    public function configureLogoutUrlGenerator(RequestEvent $event)
+    public function onKernelRequest(RequestEvent $event)
     {
         if (!$event->isMasterRequest()) {
             return;
@@ -50,11 +45,10 @@ public function configureLogoutUrlGenerator(RequestEvent $event)
         if ($this->map instanceof FirewallMap && $config = $this->map->getFirewallConfig($event->getRequest())) {
             $this->logoutUrlGenerator->setCurrentFirewall($config->getName(), $config->getContext());
         }
+
+        parent::onKernelRequest($event);
     }
 
-    /**
-     * @internal since Symfony 4.3
-     */
     public function onKernelFinishRequest(FinishRequestEvent $event)
     {
         if ($event->isMasterRequest()) {
@@ -71,7 +65,6 @@ public static function getSubscribedEvents()
     {
         return [
             KernelEvents::REQUEST => [
-                ['configureLogoutUrlGenerator', 8],
                 ['onKernelRequest', 8],
             ],
             KernelEvents::FINISH_REQUEST => 'onKernelFinishRequest',
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Debug/TraceableFirewallListenerTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Debug/TraceableFirewallListenerTest.php
@@ -51,7 +51,6 @@ public function testOnKernelRequestRecordsListeners()
             ->willReturn([[$listener], null, null]);
 
         $firewall = new TraceableFirewallListener($firewallMap, new EventDispatcher(), new LogoutUrlGenerator());
-        $firewall->configureLogoutUrlGenerator($event);
         $firewall->onKernelRequest($event);
 
         $listeners = $firewall->getWrappedListeners();
diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
@@ -31,7 +31,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class WebDebugToolbarListener implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -350,17 +350,11 @@ public function getForwardToken()
         return isset($this->data['forward_token']) ? $this->data['forward_token'] : null;
     }
 
-    /**
-     * @final since Symfony 4.3
-     */
     public function onKernelController(ControllerEvent $event)
     {
         $this->controllers[$event->getRequest()] = $event->getController();
     }
 
-    /**
-     * @final since Symfony 4.3
-     */
     public function onKernelResponse(ResponseEvent $event)
     {
         if (!$event->isMasterRequest()) {
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
@@ -66,8 +66,6 @@ protected function guessRoute(Request $request, $controller)
 
     /**
      * Remembers the controller associated to each request.
-     *
-     * @final since Symfony 4.3
      */
     public function onKernelController(ControllerEvent $event)
     {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
@@ -33,7 +33,7 @@
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  * @author Tobias Schultze <http://tobion.de>
  *
- * @internal since Symfony 4.3
+ * @internal
  */
 abstract class AbstractSessionListener implements EventSubscriberInterface
 {
@@ -121,9 +121,6 @@ public function onKernelResponse(ResponseEvent $event)
         }
     }
 
-    /**
-     * @internal
-     */
     public function onFinishRequest(FinishRequestEvent $event)
     {
         if ($event->isMasterRequest()) {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
@@ -27,7 +27,7 @@
  * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @internal since Symfony 4.3
+ * @internal
  */
 abstract class AbstractTestSessionListener implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php b/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php
@@ -20,7 +20,7 @@
  *
  * @author Gildas Quemener <gildas.quemener@gmail.com>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class AddRequestFormatsListener implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -30,7 +30,7 @@
  *
  * @author Nicolas Grekas <p@tchwork.com>
  *
- * @final since Symfony 4.4
+ * @final
  */
 class DebugHandlersListener implements EventSubscriberInterface
 {
@@ -150,9 +150,6 @@ public function configure(object $event = null)
         }
     }
 
-    /**
-     * @internal
-     */
     public function onKernelException(ExceptionEvent $event)
     {
         if (!$this->hasTerminatedWithException || !$event->isMasterRequest()) {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
@@ -26,7 +26,7 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class ExceptionListener implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
@@ -29,7 +29,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class FragmentListener implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
@@ -25,7 +25,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class LocaleListener implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
@@ -25,7 +25,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class ProfilerListener implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php b/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php
@@ -20,7 +20,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class ResponseListener implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
@@ -38,7 +38,7 @@
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Yonel Ceruto <yonelceruto@gmail.com>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class RouterListener implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php b/src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php
@@ -22,7 +22,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class StreamedResponseListener implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php b/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php
@@ -22,7 +22,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class SurrogateListener implements EventSubscriberInterface
 {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php b/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php
@@ -20,7 +20,7 @@
  *
  * @author Magnus Nordlander <magnus@fervo.se>
  *
- * @final since Symfony 4.3
+ * @final
  */
 class ValidateRequestListener implements EventSubscriberInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*`
`21`	`21`	`* @author Christophe Coevoet <stof@notk.org>`
`22`	`22`	`*`
`23`		`- * @final since Symfony 4.3`
	`23`	`+ * @final`
`24`	`24`	`*/`
`25`	`25`	`class ChromePhpHandler extends BaseChromePhpHandler`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`* @author Piotr Stankowski <git@trakos.pl>`
`24`	`24`	`*`
`25`		`- * @final since Symfony 4.4`
	`25`	`+ * @final`
`26`	`26`	`*/`
`27`	`27`	`class RouteProcessor implements EventSubscriberInterface, ResetInterface`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`* @author Jordi Boggiano <j.boggiano@seld.be>`
`23`	`23`	`*`
`24`		`- * @final since Symfony 4.3`
	`24`	`+ * @final`
`25`	`25`	`*/`
`26`	`26`	`class WebProcessor extends BaseWebProcessor implements EventSubscriberInterface`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`*`
`32`	`32`	`* @author Fabien Potencier <fabien@symfony.com>`
`33`	`33`	`*`
`34`		`- * @final since Symfony 4.3`
	`34`	`+ * @final`
`35`	`35`	`*/`
`36`	`36`	`class WebDebugToolbarListener implements EventSubscriberInterface`
`37`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -350,17 +350,11 @@ public function getForwardToken()`
`350`	`350`	`return isset($this->data['forward_token']) ? $this->data['forward_token'] : null;`
`351`	`351`	`}`
`352`	`352`
`353`		`- /**`
`354`		`- * @final since Symfony 4.3`
`355`		`- */`
`356`	`353`	`public function onKernelController(ControllerEvent $event)`
`357`	`354`	`{`
`358`	`355`	`$this->controllers[$event->getRequest()] = $event->getController();`
`359`	`356`	`}`
`360`	`357`
`361`		`- /**`
`362`		`- * @final since Symfony 4.3`
`363`		`- */`
`364`	`358`	`public function onKernelResponse(ResponseEvent $event)`
`365`	`359`	`{`
`366`	`360`	`if (!$event->isMasterRequest()) {`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,6 @@ protected function guessRoute(Request $request, $controller)`
`66`	`66`
`67`	`67`	`/**`
`68`	`68`	`* Remembers the controller associated to each request.`
`69`		`- *`
`70`		`- * @final since Symfony 4.3`
`71`	`69`	`*/`
`72`	`70`	`public function onKernelController(ControllerEvent $event)`
`73`	`71`	`{`