8000 [HttpKernel] remove all deprecated event and replace their use · symfony/symfony@48073dd · GitHub
[go: up one dir, main page]
Skip to content

Commit 48073dd

Browse files
SimperfitSimperfit
committed
[HttpKernel] remove all deprecated event and replace their use
1 parent e33ee9d commit 48073dd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+312
-537
lines changed

‎UPGRADE-5.0.md

Lines ch F438 anged: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ HttpKernel
266266
* Removed `PostResponseEvent`, use `TerminateEvent` instead
267267
* Removed `TranslatorListener` in favor of `LocaleAwareListener`
268268
* The `DebugHandlersListener` class has been made `final`
269+
* Removed `SaveSessionListener` in favor of `AbstractSessionListener`
269270

270271
Intl
271272
----

‎src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Monolog\Handler\ChromePHPHandler as BaseChromePhpHandler;
1515
use Symfony\Component\HttpFoundation\Response;
16-
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
16+
use Symfony\Component\HttpKernel\Event\ResponseEvent;
1717

1818
/**
1919
* ChromePhpHandler.
@@ -34,7 +34,7 @@ class ChromePhpHandler extends BaseChromePhpHandler
3434
/**
3535
* Adds the headers to the response once it's created.
3636
*/
37-
public function onKernelResponse(FilterResponseEvent $event)
37+
public function onKernelResponse(ResponseEvent $event)
3838
{
3939
if (!$event->isMasterRequest()) {
4040
return;

‎src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Monolog\Handler\FirePHPHandler as BaseFirePHPHandler;
1515
use Symfony\Component\HttpFoundation\Response;
16-
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
16+
use Symfony\Component\HttpKernel\Event\ResponseEvent;
1717

1818
/**
1919
* FirePHPHandler.
@@ -34,7 +34,7 @@ class FirePHPHandler extends BaseFirePHPHandler
3434
/**
3535
* Adds the headers to the response once it's created.
3636
*/
37-
public function onKernelResponse(FilterResponseEvent $event)
37+
public function onKernelResponse(ResponseEvent $event)
3838
{
3939
if (!$event->isMasterRequest()) {
4040
return;

‎src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Monolog\Handler\SwiftMailerHandler as BaseSwiftMailerHandler;
1515
use Symfony\Component\Console\Event\ConsoleTerminateEvent;
16-
use Symfony\Component\HttpKernel\Event\PostResponseEvent;
16+
use Symfony\Component\HttpKernel\Event\TerminateEvent;
1717

1818
/**
1919
* Extended SwiftMailerHandler that flushes mail queue if necessary.
@@ -36,7 +36,7 @@ public function setTransport(\Swift_Transport $transport)
3636
/**
3737
* After the kernel has been terminated we will always flush messages.
3838
*/
39-
public function onKernelTerminate(PostResponseEvent $event)
39+
public function onKernelTerminate(TerminateEvent $event)
4040
{
4141
$this->instantFlush = true;
4242
}

‎src/Symfony/Bridge/Monolog/Processor/RouteProcessor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
1515
use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
16-
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
16+
use Symfony\Component\HttpKernel\Event\RequestEvent;
1717
use Symfony\Component\HttpKernel\KernelEvents;
1818
use Symfony\Contracts\Service\ResetInterface;
1919

@@ -49,7 +49,7 @@ public function reset()
4949
$this->routeData = [];
5050
}
5151

52-
public function addRouteData(GetResponseEvent $event)
52+
public function addRouteData(RequestEvent $event)
5353
{
5454
if ($event->isMasterRequest()) {
5555
$this->reset();

‎src/Symfony/Bridge/Monolog/Processor/WebProcessor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Monolog\Processor\WebProcessor as BaseWebProcessor;
1515
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
16-
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
16+
use Symfony\Component\HttpKernel\Event\ResponseEvent;
1717
use Symfony\Component\HttpKernel\KernelEvents;
1818

1919
/**
@@ -31,7 +31,7 @@ public function __construct(array $extraFields = null)
3131
parent::__construct([], $extraFields);
3232
}
3333

34-
public function onKernelRequest(GetResponseEvent $event)
34+
public function onKernelRequest(ResponseEvent $event)
3535
{
3636
if ($event->isMasterRequest()) {
3737
$this->serverData = $event->getRequest()->server->all();

‎src/Symfony/Bridge/Monolog/Tests/Processor/RouteProcessorTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\HttpFoundation\ParameterBag;
1717
use Symfony\Component\HttpFoundation\Request;
1818
use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
19-
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
19+
use Symfony\Component\HttpKernel\Event\RequestEvent;
2020

2121
class RouteProcessorTest extends TestCase
2222
{
@@ -122,9 +122,9 @@ public function testProcessorDoesNothingWhenNoRequest()
122122
$this->assertEquals(['extra' => []], $record);
123123
}
124124

125-
private function mockGetResponseEvent(Request $request): GetResponseEvent
125+
private function mockGetResponseEvent(Request $request): RequestEvent
126126
{
127-
$event = $this->getMockBuilder(GetResponseEvent::class)->disableOriginalConstructor()->getMock();
127+
$event = $this->getMockBuilder(RequestEvent::class)->disableOriginalConstructor()->getMock();
128128
$event->method('getRequest')->willReturn($request);
129129

130130
return $event;

‎src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use PHPUnit\Framework\TestCase;
1616
use Symfony\Bridge\Monolog\Processor\WebProcessor;
1717
use Symfony\Component\HttpFoundation\Request;
18-
use Symfony\Component\HttpKernel\Event\RequestEvent;
18+
use Symfony\Component\HttpKernel\Event\ResponseEvent;
1919

2020
class WebProcessorTest extends TestCase
2121
{
@@ -88,7 +88,7 @@ private function createRequestEvent($additionalServerParameters = []): array
8888
$request->server->replace($server);
8989
$request->headers->replace($server);
9090

91-
$event = $this->getMockBuilder(RequestEvent::class)
91+
$event = $this->getMockBuilder(ResponseEvent::class)
9292
->disableOriginalConstructor()
9393
->getMock();
9494
$event->expects($this->any())

‎src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
2020
use Symfony\Component\Filesystem\Filesystem;
2121
use Symfony\Component\HttpFoundation\Response;
22-
use Symfony\Component\HttpKernel\Event\RequestEvent;
22+
use Symfony\Component\HttpKernel\Event\ExceptionEvent;
2323
use Symfony\Component\HttpKernel\Kernel;
2424
use Symfony\Component\HttpKernel\KernelEvents;
2525
use Symfony\Component\Routing\RouteCollectionBuilder;
@@ -30,7 +30,7 @@ class ConcreteMicroKernel extends Kernel implements EventSubscriberInterface
3030

3131
private $cacheDir;
3232

33-
public function onKernelException(RequestEvent $event)
33+
public function onKernelException(ExceptionEvent $event)
3434
{
3535
if ($event->getException() instanceof Danger) {
3636
$event->setResponse(Response::create('It\'s dangerous to go alone. Take this ⚔'));

‎src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Bundle\SecurityBundle\Security\FirewallMap;
1515
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
1616
use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
17-
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
17+
use Symfony\Component\HttpKernel\Event\RequestEvent;
1818
use Symfony\Component\HttpKernel\KernelEvents;
1919
use Symfony\Component\Security\Http\Firewall;
2020
use Symfony\Component\Security\Http\FirewallMapInterface;
@@ -41,7 +41,7 @@ public function __construct(FirewallMapInterface $map, EventDispatcherInterface
4141
/**
4242
* @internal
4343
*/
44-
public function configureLogoutUrlGenerator(GetResponseEvent $event)
44+
public function configureLogoutUrlGenerator(RequestEvent $event)
4545
{
4646
if (!$event->isMasterRequest()) {
4747
return;

‎src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\HttpFoundation\Request;
1717
use Symfony\Component\HttpFoundation\Response;
1818
use Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag;
19-
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
19+
use Symfony\Component\HttpKernel\Event\ResponseEvent;
2020
use Symfony\Component\HttpKernel\KernelEvents;
2121
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
2222
use Twig\Environment;
@@ -60,7 +60,7 @@ public function isEnabled()
6060
return self::DISABLED !== $this->mode;
6161
}
6262

63-
public function onKernelResponse(FilterResponseEvent $event)
63+
public function onKernelResponse(ResponseEvent $event)
6464
{
6565
$response = $event->getResponse();
6666
$request = $event->getRequest();

‎src/Symfony/Component/HttpKernel/CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,15 @@ CHANGELOG
88
* removed `ConfigDataCollector::getApplicationName()`
99
* removed `ConfigDataCollector::getApplicationVersion()`
1010
* removed support for `Symfony\Component\Templating\EngineInterface` in `HIncludeFragmentRenderer`, use a `Twig\Environment` only
11-
* removed `TranslatorListener`
11+
* removed `TranslatorListener` in favor of `LocaleAwareListener`
12+
* removed `FilterControllerArgumentsEvent`, use `ControllerArgumentsEvent` instead
13+
* removed `FilterControllerEvent`, use `ControllerEvent` instead
14+
* removed `FilterResponseEvent`, use `ResponseEvent` instead
15+
* removed `GetResponseEvent`, use `RequestEvent` instead
16+
* removed `GetResponseForControllerResultEvent`, use `ViewEvent` instead
17+
* removed `GetResponseForExceptionEvent`, use `ExceptionEvent` instead
18+
* removed `PostResponseEvent`, use `TerminateEvent` instead
19+
* removed `SaveSessionListener` in favor of `AbstractSessionListener`
1220

1321
4.3.0
1422
-----

‎src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
use Symfony\Component\HttpFoundation\ParameterBag;
1717
use Symfony\Component\HttpFoundation\Request;
1818
use Symfony\Component\HttpFoundation\Response;
19-
use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
20-
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
19+
use Symfony\Component\HttpKernel\Event\ControllerEvent;
20+
use Symfony\Component\HttpKernel\Event\ResponseEvent;
2121
use Symfony\Component\HttpKernel\KernelEvents;
2222

2323
/**
@@ -353,15 +353,15 @@ public function getForwardToken()
353353
/**
354354
* @final since Symfony 4.3
355355
*/
356-
public function onKernelController(FilterControllerEvent $event)
356+
public function onKernelController(ControllerEvent $event)
357357
{
358358
$this->controllers[$event->getRequest()] = $event->getController();
359359
}
360360

361361
/**
362362
* @final since Symfony 4.3
363363
*/
364-
public function onKernelResponse(FilterResponseEvent $event)
364+
public function onKernelResponse(ResponseEvent $event)
365365
{
366366
if (!$event->isMasterRequest()) {
367367
return;

‎src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\HttpFoundation\RedirectResponse;
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpFoundation\Response;
17-
use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
17+
use Symfony\Component\HttpKernel\Event\ControllerEvent;
1818

1919
/**
2020
* @author Fabien Potencier <fabien@symfony.com>
@@ -69,7 +69,7 @@ protected function guessRoute(Request $request, $controller)
6969
*
7070
* @final since Symfony 4.3
7171
*/
72-
public function onKernelController(FilterControllerEvent $event)
72+
public function onKernelController(ControllerEvent $event)
7373
{
7474
$this->controllers[$event->getRequest()] = $event->getController();
7575
}

‎src/Symfony/Component/HttpKernel/Event/ControllerArgumentsEvent.php

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111

1212
namespace Symfony\Component\HttpKernel\Event;
1313

14+
use Symfony\Component\HttpFoundation\Request;
15+
use Symfony\Component\HttpKernel\HttpKernelInterface;
16+
1417
/**
1518
* Allows filtering of controller arguments.
1619
*
@@ -23,6 +26,27 @@
2326
*
2427
* @author Christophe Coevoet <stof@notk.org>
2528
*/
26-
class ControllerArgumentsEvent extends FilterControllerArgumentsEvent
29+
class ControllerArgumentsEvent extends ControllerEvent
2730
{
31+
private $arguments;
32+
33+
public function __construct(HttpKernelInterface $kernel, callable $controller, array $arguments, Request $request, ?int $requestType)
34+
{
35+
parent::__construct($kernel, $controller, $request, $requestType);
36+
37+
$this->arguments = $arguments;
38+
}
39+
40+
/**
41+
* @return array
42+
*/
43+
public function getArguments()
44+
{
45+
return $this->arguments;
46+
}
47+
48+
public function setArguments(array $arguments)
49+
{
50+
$this->arguments = $arguments;
51+
}
2852
}

‎src/Symfony/Component/HttpKernel/Event/ControllerEvent.php

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111

1212
namespace Symfony\Component\HttpKernel\Event;
1313

14+
use Symfony\Component\HttpFoundation\Request;
15+
use Symfony\Component\HttpKernel\HttpKernelInterface;
16+
1417
/**
1518
* Allows filtering of a controller callable.
1619
*
@@ -22,6 +25,29 @@
2225
*
2326
* @author Bernhard Schussek <bschussek@gmail.com>
2427
*/
25-
class ControllerEvent extends FilterControllerEvent
28+
class ControllerEvent extends KernelEvent
2629
{
30+
private $controller;
31+
32+
public function __construct(HttpKernelInterface $kernel, callable $controller, Request $request, ?int $requestType)
33+
{
34+
parent::__construct($kernel, $request, $requestType);
35+
36+
$this->setController($controller);
37+
}
38+
39+
/**
40+
* Returns the current controller.
41+
*
42+
* @return callable
43+
*/
44+
public function getController()
45+
{
46+
return $this->controller;
47+
}
48+
49+
public function setController(callable $controller)
50+
{
51+
$this->controller = $controller;
52+
}
2753
}

0 commit comments

Comments
 (0)
0