8000 [3.0] [EventDispatcher][Event] removed deprecated name methods. · symfony/symfony@4ab3e8b · GitHub
[go: up one dir, main page]
Skip to content

Commit 4ab3e8b

Browse files
aitboudadaitboudad
committed
[3.0] [EventDispatcher][Event] removed deprecated name methods.
1 parent ba70a48 commit 4ab3e8b

File tree

5 files changed

+3
-55
lines changed

5 files changed

+3
-55
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ CHANGELOG
44
3.0.0
55
-----
66

7-
* The methods Event::setDispatcher(), Event::getDispatcher() have been removed.
8-
The event dispatcher is passed to the listener call.
7+
* The methods Event::setDispatcher(), Event::getDispatcher(), Event::setName()
8+
and Event::setName() have been removed.
9+
The event dispatcher and name is passed to the listener call.
910

1011
2.5.0
1112
-----

‎src/Symfony/Component/EventDispatcher/Event.php

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@ class Event
3434
*/
3535
private $propagationStopped = false;
3636

37-
/**
38-
* @var EventDispatcher Dispatcher that dispatched this event
39-
*/
40-
private $dispatcher;
41-
42-
/**
43-
* @var string This event's name
44-
*/
45-
private $name;
46-
4737
/**
4838
* Returns whether further event listeners should be triggered.
4939
*
@@ -71,34 +61,4 @@ public function stopPropagation()
7161
{
7262
$this->propagationStopped = true;
7363
}
74 10000 -
75-
/**
76-
* Gets the event's name.
77-
*
78-
* @return string
79-
*
80-
* @deprecated since version 2.4, to be removed in 3.0. The event name is passed to the listener call.
81-
*
82-
* @api
83-
*/
84-
public function getName()
85-
{
86-
trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event name can be received in the listener call instead.', E_USER_DEPRECATED);
87-
88-
return $this->name;
89-
}
90-
91-
/**
92-
* Sets the event's name property.
93-
*
94-
* @param string $name The event name.
95-
*
96-
* @deprecated since version 2.4, to be removed in 3.0. The event name is passed to the listener call.
97-
*
98-
* @api
99-
*/
100-
public function setName($name)
101-
{
102-
$this->name = $name;
103-
}
10464
}

‎src/Symfony/Component/EventDispatcher/EventDispatcher.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ public function dispatch($eventName, Event $event = null)
4343
$event = new Event();
4444
}
4545

46-
$event->setName($eventName);
47-
4846
if (!isset($this->listeners[$eventName])) {
4947
return $event;
5048
}

‎src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,6 @@ public function testDispatch()
121121
$this->assertSame($event, $return);
122122
}
123123

124-
public function testLegacyDispatch()
125-
{
126-
$this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
127-
128-
$event = new Event();
129-
$return = $this->dispatcher->dispatch(self::preFoo, $event);
130-
$this->assertEquals('pre.foo', $event->getName());
131-
}
132-
133124
public function testDispatchForClosure()
134125
{
135126
$invoked = 0;

‎src/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ public function testHasListenersOnLazyLoad()
164164
$dispatcher = new ContainerAwareEventDispatcher($container);
165165
$dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
166166

167-
$event->setName('onEvent');
168-
169167
$service
170168
->expects($this->once())
171169
->method('onEvent')

0 commit comments

Comments
 (0)
0