Fix annotations

This commit is contained in:
Nicolas Grekas 2019-06-08 08:23:28 +02:00
parent 48073ddcf9
commit be5f641308
23 changed files with 23 additions and 45 deletions

View File

@ -20,7 +20,7 @@ use Symfony\Component\HttpKernel\Event\ResponseEvent;
*
* @author Christophe Coevoet <stof@notk.org>
*
* @final since Symfony 4.3
* @final
*/
class ChromePhpHandler extends BaseChromePhpHandler
{

View File

@ -20,7 +20,7 @@ use Symfony\Component\HttpKernel\Event\ResponseEvent;
*
* @author Jordi Boggiano <j.boggiano@seld.be>
*
* @final since Symfony 4.3
* @final
*/
class FirePHPHandler extends BaseFirePHPHandler
{

View File

@ -20,7 +20,7 @@ use Symfony\Component\HttpKernel\Event\TerminateEvent;
*
* @author Philipp Kräutli <pkraeutli@astina.ch>
*
* @final since Symfony 4.3
* @final
*/
class SwiftMailerHandler extends BaseSwiftMailerHandler
{

View File

@ -22,7 +22,7 @@ use Symfony\Contracts\Service\ResetInterface;
*
* @author Piotr Stankowski <git@trakos.pl>
*
* @final since Symfony 4.4
* @final
*/
class RouteProcessor implements EventSubscriberInterface, ResetInterface
{

View File

@ -21,7 +21,7 @@ use Symfony\Component\HttpKernel\KernelEvents;
*
* @author Jordi Boggiano <j.boggiano@seld.be>
*
* @final since Symfony 4.3
* @final
*/
class WebProcessor extends BaseWebProcessor implements EventSubscriberInterface
{

View File

@ -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 @@ class FirewallListener extends Firewall
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 @@ class FirewallListener extends Firewall
{
return [
KernelEvents::REQUEST => [
['configureLogoutUrlGenerator', 8],
['onKernelRequest', 8],
],
KernelEvents::FINISH_REQUEST => 'onKernelFinishRequest',

View File

@ -51,7 +51,6 @@ class TraceableFirewallListenerTest extends TestCase
->willReturn([[$listener], null, null]);
$firewall = new TraceableFirewallListener($firewallMap, new EventDispatcher(), new LogoutUrlGenerator());
$firewall->configureLogoutUrlGenerator($event);
$firewall->onKernelRequest($event);
$listeners = $firewall->getWrappedListeners();

View File

@ -31,7 +31,7 @@ use Twig\Environment;
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @final since Symfony 4.3
* @final
*/
class WebDebugToolbarListener implements EventSubscriberInterface
{

View File

@ -350,17 +350,11 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
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()) {

View File

@ -66,8 +66,6 @@ class RouterDataCollector extends DataCollector
/**
* Remembers the controller associated to each request.
*
* @final since Symfony 4.3
*/
public function onKernelController(ControllerEvent $event)
{

View File

@ -33,7 +33,7 @@ use Symfony\Component\HttpKernel\KernelEvents;
* @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 @@ abstract class AbstractSessionListener implements EventSubscriberInterface
}
}
/**
* @internal
*/
public function onFinishRequest(FinishRequestEvent $event)
{
if ($event->isMasterRequest()) {

View File

@ -27,7 +27,7 @@ use Symfony\Component\HttpKernel\KernelEvents;
* @author Bulat Shakirzyanov <mallluhuct@gmail.com>
* @author Fabien Potencier <fabien@symfony.com>
*
* @internal since Symfony 4.3
* @internal
*/
abstract class AbstractTestSessionListener implements EventSubscriberInterface
{

View File

@ -20,7 +20,7 @@ use Symfony\Component\HttpKernel\KernelEvents;
*
* @author Gildas Quemener <gildas.quemener@gmail.com>
*
* @final since Symfony 4.3
* @final
*/
class AddRequestFormatsListener implements EventSubscriberInterface
{

View File

@ -30,7 +30,7 @@ use Symfony\Component\HttpKernel\KernelEvents;
*
* @author Nicolas Grekas <p@tchwork.com>
*
* @final since Symfony 4.4
* @final
*/
class DebugHandlersListener implements EventSubscriberInterface
{
@ -150,9 +150,6 @@ class DebugHandlersListener implements EventSubscriberInterface
}
}
/**
* @internal
*/
public function onKernelException(ExceptionEvent $event)
{
if (!$this->hasTerminatedWithException || !$event->isMasterRequest()) {

View File

@ -26,7 +26,7 @@ use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
/**
* @author Fabien Potencier <fabien@symfony.com>
*
* @final since Symfony 4.3
* @final
*/
class ExceptionListener implements EventSubscriberInterface
{

View File

@ -29,7 +29,7 @@ use Symfony\Component\HttpKernel\UriSigner;
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @final since Symfony 4.3
* @final
*/
class FragmentListener implements EventSubscriberInterface
{

View File

@ -25,7 +25,7 @@ use Symfony\Component\Routing\RequestContextAwareInterface;
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @final since Symfony 4.3
* @final
*/
class LocaleListener implements EventSubscriberInterface
{

View File

@ -25,7 +25,7 @@ use Symfony\Component\HttpKernel\Profiler\Profiler;
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @final since Symfony 4.3
* @final
*/
class ProfilerListener implements EventSubscriberInterface
{

View File

@ -20,7 +20,7 @@ use Symfony\Component\HttpKernel\KernelEvents;
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @final since Symfony 4.3
* @final
*/
class ResponseListener implements EventSubscriberInterface
{

View File

@ -38,7 +38,7 @@ use Symfony\Component\Routing\RequestContextAwareInterface;
* @author Fabien Potencier <fabien@symfony.com>
* @author Yonel Ceruto <yonelceruto@gmail.com>
*
* @final since Symfony 4.3
* @final
*/
class RouterListener implements EventSubscriberInterface
{

View File

@ -22,7 +22,7 @@ use Symfony\Component\HttpKernel\KernelEvents;
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @final since Symfony 4.3
* @final
*/
class StreamedResponseListener implements EventSubscriberInterface
{

View File

@ -22,7 +22,7 @@ use Symfony\Component\HttpKernel\KernelEvents;
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @final since Symfony 4.3
* @final
*/
class SurrogateListener implements EventSubscriberInterface
{

View File

@ -20,7 +20,7 @@ use Symfony\Component\HttpKernel\KernelEvents;
*
* @author Magnus Nordlander <magnus@fervo.se>
*
* @final since Symfony 4.3
* @final
*/
class ValidateRequestListener implements EventSubscriberInterface
{