[3.0] [EventDispatcher][Event] removed deprecated name methods.

This commit is contained in:
Abdellatif Ait boudad 2015-01-05 16:43:43 +00:00
parent ba70a484f1
commit 4ab3e8bba2
5 changed files with 3 additions and 55 deletions

View File

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

View File

@ -34,16 +34,6 @@ class Event
*/
private $propagationStopped = false;
/**
* @var EventDispatcher Dispatcher that dispatched this event
*/
private $dispatcher;
/**
* @var string This event's name
*/
private $name;
/**
* Returns whether further event listeners should be triggered.
*
@ -71,34 +61,4 @@ class Event
{
$this->propagationStopped = true;
}
/**
* Gets the event's name.
*
* @return string
*
* @deprecated since version 2.4, to be removed in 3.0. The event name is passed to the listener call.
*
* @api
*/
public function getName()
{
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);
return $this->name;
}
/**
* Sets the event's name property.
*
* @param string $name The event name.
*
* @deprecated since version 2.4, to be removed in 3.0. The event name is passed to the listener call.
*
* @api
*/
public function setName($name)
{
$this->name = $name;
}
}

View File

@ -43,8 +43,6 @@ class EventDispatcher implements EventDispatcherInterface
$event = new Event();
}
$event->setName($eventName);
if (!isset($this->listeners[$eventName])) {
return $event;
}

View File

@ -121,15 +121,6 @@ abstract class AbstractEventDispatcherTest extends \PHPUnit_Framework_TestCase
$this->assertSame($event, $return);
}
public function testLegacyDispatch()
{
$this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
$event = new Event();
$return = $this->dispatcher->dispatch(self::preFoo, $event);
$this->assertEquals('pre.foo', $event->getName());
}
public function testDispatchForClosure()
{
$invoked = 0;

View File

@ -164,8 +164,6 @@ class ContainerAwareEventDispatcherTest extends AbstractEventDispatcherTest
$dispatcher = new ContainerAwareEventDispatcher($container);
$dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
$event->setName('onEvent');
$service
->expects($this->once())
->method('onEvent')