Skip to content

Commit

Permalink
Renaming some methods to access the event list.
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Krämer committed May 31, 2016
1 parent 75a9863 commit 2004d5a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions src/Event/EventManager.php
Expand Up @@ -486,7 +486,7 @@ public function matchingListeners($eventKeyPattern)
*
* @return array
*/
public function eventList()
public function getEventList()
{
return $this->_eventList;
}
Expand Down Expand Up @@ -521,7 +521,7 @@ public function listEvents($enabled)
* @param \Cake\Event\EventList $eventList The event stack object to use.
* @return void
*/
public function attachEventList(EventList $eventList)
public function setEventList(EventList $eventList)
{
$this->_eventList = $eventList;
$this->_listEvents = true;
Expand All @@ -532,7 +532,7 @@ public function attachEventList(EventList $eventList)
*
* @return void
*/
public function detachEventList()
public function unsetEventList()
{
$this->_eventList = null;
$this->_listEvents = false;
Expand Down
12 changes: 6 additions & 6 deletions tests/TestCase/Event/EventManagerTest.php
Expand Up @@ -726,25 +726,25 @@ public function testGetDispatchedEvents()
$event2 = new Event('my_second_event', $this);

$manager = new EventManager();
$manager->attachEventList($eventList);
$manager->setEventList($eventList);
$manager->dispatch($event);
$manager->dispatch($event2);

$result = $manager->eventList();
$result = $manager->getEventList();
$this->assertInstanceOf('\Cake\Event\EventList', $result);
$this->assertCount(2, $result);
$this->assertEquals($result[0], $event);
$this->assertEquals($result[1], $event2);

$manager->eventList()->flush();
$result = $manager->eventList();
$manager->getEventList()->flush();
$result = $manager->getEventList();
$this->assertCount(0, $result);

$manager->detachEventList();
$manager->unsetEventList();
$manager->dispatch($event);
$manager->dispatch($event2);

$result = $manager->eventList();
$result = $manager->getEventList();
$this->assertNull($result);
}
}

0 comments on commit 2004d5a

Please sign in to comment.