Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 01531f3

Browse files
nicolas-grekasnicolas-grekas
committed
[EventDispatcher] swap arguments of dispatch() to allow registering events by FQCN
1 parent 29f81b0 commit 01531f3

File tree

161 files changed

+1629
-657
lines changed

Some content is hidden

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

161 files changed

+1629
-657
lines changed

‎UPGRADE-4.3.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ Config
2121

2222
* Deprecated using environment variables with `cannotBeEmpty()` if the value is validated with `validate()`
2323

24+
EventDispatcher
25+
---------------
26+
27+
* The signature of the `EventDispatcherInterface::dispatch()` method should be updated to `dispatch($event, string $eventName = null)`, not doing so is deprecated
28+
2429
Form
2530
----
2631

@@ -55,7 +60,14 @@ HttpFoundation
5560
HttpKernel
5661
----------
5762

58-
* renamed `Client` to `HttpKernelBrowser`
63+
* Renamed `Client` to `HttpKernelBrowser`
64+
* Renamed `FilterControllerArgumentsEvent` to `ControllerArgumentsEvent`
65+
* Renamed `FilterControllerEvent` to `ControllerEvent`
66+
* Renamed `FilterResponseEvent` to `ResponseEvent`
67+
* Renamed `GetResponseEvent` to `RequestEvent`
68+
* Renamed `GetResponseForControllerResultEvent` to `ViewEvent`
69+
* Renamed `GetResponseForExceptionEvent` to `ExceptionEvent`
70+
* Renamed `PostResponseEvent` to `TerminateEvent`
5971

6072
Messenger
6173
---------
@@ -80,6 +92,8 @@ Security
8092
Use the `getReachableRoleNames()` method instead.
8193
* The `getRoles()` method of the `TokenInterface` is deprecated. Tokens must implement the `getRoleNames()`
8294
method instead and return roles as strings.
95+
* The `ListenerInterface` is deprecated, turn your listeners into callables instead.
96+
* The `Firewall::handleRequest()` method is deprecated, use `Firewall::callListeners()` instead.
8397
* The `AbstractToken::serialize()`, `AbstractToken::unserialize()`,
8498
`AuthenticationException::serialize()` and `AuthenticationException::unserialize()`
8599
methods are now final, use `getState()` and `setState()` instead.

‎UPGRADE-5.0.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ EventDispatcher
7070
---------------
7171

7272
* The `TraceableEventDispatcherInterface` has been removed.
73+
* The signature of the `EventDispatcherInterface::dispatch()` method has been updated to `dispatch($event, string $eventName = null)`
7374

7475
Filesystem
7576
----------
@@ -206,6 +207,13 @@ HttpKernel
206207
* Removed the first and second constructor argument of `ConfigDataCollector`
207208
* Removed `ConfigDataCollector::getApplicationName()`
208209
* Removed `ConfigDataCollector::getApplicationVersion()`
210+
* Removed `FilterControllerArgumentsEvent`, use `ControllerArgumentsEvent` instead
211+
* Removed `FilterControllerEvent`, use `ControllerEvent` instead
212+
* Removed `FilterResponseEvent`, use `ResponseEvent` instead
213+
* Removed `GetResponseEvent`, use `RequestEvent` instead
214+
* Removed `GetResponseForControllerResultEvent`, use `ViewEvent` instead
215+
* Removed `GetResponseForExceptionEvent`, use `ExceptionEvent` instead
216+
* Removed `PostResponseEvent`, use `TerminateEvent` instead
209217

210218
Monolog
211219
-------
@@ -257,6 +265,8 @@ Security
257265
* `SimpleAuthenticatorInterface`, `SimpleFormAuthenticatorInterface`, `SimplePreAuthenticatorInterface`,
258266
`SimpleAuthenticationProvider`, `SimpleAuthenticationHandler`, `SimpleFormAuthenticationListener` and
259267
`SimplePreAuthenticationListener` have been removed. Use Guard instead.
268+
* The `ListenerInterface` has been removed, turn your listeners into callables instead.
269+
* The `Firewall::handleRequest()` method has been removed, use `Firewall::callListeners()` instead.
260270
* `\Serializable` interface has been removed from `AbstractToken` and `AuthenticationException`,
261271
thus `serialize()` and `unserialize()` aren't available.
262272
Use `getState()` and `setState()` instead.

‎src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testOnSubmitDoNothing()
6363
$submittedData = ['test'];
6464
$event = new FormEvent($this->getForm(), $submittedData);
6565

66-
$this->dispatcher->dispatch(FormEvents::SUBMIT, $event);
66+
$this->dispatcher->dispatch($event, FormEvents::SUBMIT);
6767

6868
$this->assertTrue($this->collection->contains('test'));
6969
$this->assertSame(1, $this->collection->count());
@@ -74,7 +74,7 @@ public function testOnSubmitNullClearCollection()
7474
$submittedData = [];
7575
$event = new FormEvent($this->getForm(), $submittedData);
7676

77-
$this->dispatcher->dispatch(FormEvents::SUBMIT, $event);
77+
$this->dispatcher->dispatch($event, FormEvents::SUBMIT);
7878

7979
$this->assertTrue($this->collection->isEmpty());
8080
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
* ChromePhpHandler.
2020
*
2121
* @author Christophe Coevoet <[email protected]>
22+
*
23+
* @final since Symfony 4.3
2224
*/
2325
class ChromePhpHandler extends BaseChromePhpHandler
2426
{

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
* FirePHPHandler.
2020
*
2121
* @author Jordi Boggiano <[email protected]>
22+
*
23+
* @final since Symfony 4.3
2224
*/
2325
class FirePHPHandler extends BaseFirePHPHandler
2426
{

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
* Extended SwiftMailerHandler that flushes mail queue if necessary.
2020
*
2121
* @author Philipp Kräutli <[email protected]>
22+
*
23+
* @final since Symfony 4.3
2224
*/
2325
class SwiftMailerHandler extends BaseSwiftMailerHandler
2426
{

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
* WebProcessor override to read from the HttpFoundation's Request.
2121
*
2222
* @author Jordi Boggiano <[email protected]>
23+
*
24+
* @final since Symfony 4.3
2325
*/
2426
class WebProcessor extends BaseWebProcessor implements EventSubscriberInterface
2527
{

‎src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,12 @@ public function testLogsFromListeners()
196196
});
197197

198198
$event = new ConsoleCommandEvent(new Command('foo'), $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock(), $output);
199-
$dispatcher->dispatch(ConsoleEvents::COMMAND, $event);
199+
$dispatcher->dispatch($event, ConsoleEvents::COMMAND);
200200
$this->assertContains('Before command message.', $out = $output->fetch());
201201
$this->assertContains('After command message.', $out);
202202

203203
$event = new ConsoleTerminateEvent(new Command('foo'), $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock(), $output, 0);
204-
$dispatcher->dispatch(ConsoleEvents::TERMINATE, $event);
204+
$dispatcher->dispatch($event, ConsoleEvents::TERMINATE);
205205
$this->assertContains('Before terminate message.', $out = $output->fetch());
206206
$this->assertContains('After terminate message.', $out);
207207
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +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;
1819

1920
class WebProcessorTest extends TestCase
2021
{
@@ -87,7 +88,7 @@ private function createRequestEvent($additionalServerParameters = []): array
8788
$request->server->replace($server);
8889
$request->headers->replace($server);
8990

90-
$event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
91+
$event = $this->getMockBuilder(RequestEvent::class)
9192
->disableOriginalConstructor()
9293
->getMock();
9394
$event->expects($this->any())

‎src/Symfony/Bridge/Monolog/composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919
"php": "^7.1.3",
2020
"monolog/monolog": "~1.19",
2121
"symfony/contracts": "^1.0",
22-
"symfony/http-kernel": "~3.4|~4.0"
22+
"symfony/http-kernel": "^4.3"
2323
},
2424
"require-dev": {
2525
"symfony/console": "~3.4|~4.0",
26-
"symfony/event-dispatcher": "~3.4|~4.0",
2726
"symfony/security-core": "~3.4|~4.0",
2827
"symfony/var-dumper": "~3.4|~4.0"
2928
},
@@ -34,7 +33,6 @@
3433
"suggest": {
3534
"symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel.",
3635
"symfony/console": "For the possibility to show log messages in console commands depending on verbosity settings.",
37-
"symfony/event-dispatcher": "Needed when using log messages in console commands.",
3836
"symfony/var-dumper": "For using the debugging handlers like the console handler or the log server handler."
3937
},
4038
"autoload": {

0 commit comments

Comments
 (0)