Skip to content

Commit 001dba6

Browse files
nicolas-grekasnicolas-grekas
committed
[EventDispatcher] swap arguments of dispatch() to allow registering events by FQCN
1 parent bcff647 commit 001dba6

File tree

117 files changed

+1068
-304
lines changed

Some content is hidden

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

117 files changed

+1068
-304
lines changed

‎UPGRADE-4.3.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
UPGRADE FROM 4.2 to 4.3
2+
=======================
3+
4+
EventDispatcher
5+
---------------
6+
7+
* The signature of the `EventDispatcherInterface::dispatch()` method should be updated to `dispatch($event, string $eventName = null)`, not doing so is deprecated

‎UPGRADE-5.0.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ EventDispatcher
6363
---------------
6464

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

6768
Finder
6869
------

‎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 = array('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 = array();
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 <stof@notk.org>
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 <j.boggiano@seld.be>
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 <pkraeutli@astina.ch>
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 <j.boggiano@seld.be>
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/Bundle/FrameworkBundle/Resources/config/services.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,37 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

7+
<parameters>
8+
<parameter key="event_dispatcher.event_aliases" type="collection">
9+
<parameter key="Symfony\Component\Console\Event\ConsoleCommandEvent">console.command</parameter>
10+
<parameter key="Symfony\Component\Console\Event\ConsoleErrorEvent">console.error</parameter>
11+
<parameter key="Symfony\Component\Console\Event\ConsoleTerminateEvent">console.terminate</parameter>
12+
<parameter key="Symfony\Component\Form\PreSubmitEvent">form.pre_submit</parameter>
13+
<parameter key="Symfony\Component\Form\SubmitEvent">form.submit</parameter>
14+
<parameter key="Symfony\Component\Form\PostSubmitEvent">form.post_submit</parameter>
15+
<parameter key="Symfony\Component\Form\PreSetDataEvent">form.pre_set_data</parameter>
16+
<parameter key="Symfony\Component\Form\PostSetDataEvent">form.post_set_data</parameter>
17+
<parameter key="Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent">kernel.controller_arguments</parameter>
18+
<parameter key="Symfony\Component\HttpKernel\Event\ControllerEvent">kernel.controller</parameter>
19+
<parameter key="Symfony\Component\HttpKernel\Event\ResponseEvent">kernel.response</parameter>
20+
<parameter key="Symfony\Component\HttpKernel\Event\FinishRequestEvent">kernel.finish_request</parameter>
21+
<parameter key="Symfony\Component\HttpKernel\Event\RequestEvent">kernel.request</parameter>
22+
<parameter key="Symfony\Component\HttpKernel\Event\ViewEvent">kernel.view</parameter>
23+
<parameter key="Symfony\Component\HttpKernel\Event\ExceptionEvent">kernel.exception</parameter>
24+
<parameter key="Symfony\Component\HttpKernel\Event\TerminateEvent">kernel.terminate</parameter>
25+
<parameter key="Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent">security.authentication.success</parameter>
26+
<parameter key="Symfony\Component\Security\Core\Event\AuthenticationFailureEvent">security.authentication.failure</parameter>
27+
<parameter key="Symfony\Component\Security\Http\Event\InteractiveLoginEvent">security.interactive_login</parameter>
28+
<parameter key="Symfony\Component\Security\Http\Event\SwitchUserEvent">security.switch_user</parameter>
29+
<parameter key="Symfony\Component\Workflow\Event\GuardEvent">workflow.guard</parameter>
30+
<parameter key="Symfony\Component\Workflow\Event\LeaveEvent">workflow.leave</parameter>
31+
<parameter key="Symfony\Component\Workflow\Event\TransitionEvent">workflow.transition</parameter>
32+
<parameter key="Symfony\Component\Workflow\Event\EnterEvent">workflow.enter</parameter>
33+
<parameter key="Symfony\Component\Workflow\Event\EnteredEvent">workflow.entered</parameter>
34+
<parameter key="Symfony\Component\Workflow\Event\CompletedEvent">workflow.completed</parameter>
35+
<parameter key="Symfony\Component\Workflow\Event\AnnounceEvent">workflow.announce</parameter>
36+
</parameter>
37+
</parameters>
738
<services>
839
<defaults public="false" />
940

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
/**
2323
* @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
24+
*
25+
* @final since Symfony 4.3
2426
*/
2527
class FirewallListener extends Firewall
2628
{

0 commit comments

Comments
 (0)