Browse Source

Renaming some methods to access the event list.

Florian Krämer 9 years ago
parent
commit
2004d5a1f7
2 changed files with 9 additions and 9 deletions
  1. 3 3
      src/Event/EventManager.php
  2. 6 6
      tests/TestCase/Event/EventManagerTest.php

+ 3 - 3
src/Event/EventManager.php

@@ -486,7 +486,7 @@ class EventManager
      *
      * @return array
      */
-    public function eventList()
+    public function getEventList()
     {
         return $this->_eventList;
     }
@@ -521,7 +521,7 @@ class EventManager
      * @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;
@@ -532,7 +532,7 @@ class EventManager
      *
      * @return void
      */
-    public function detachEventList()
+    public function unsetEventList()
     {
         $this->_eventList = null;
         $this->_listEvents = false;

+ 6 - 6
tests/TestCase/Event/EventManagerTest.php

@@ -726,25 +726,25 @@ class EventManagerTest extends TestCase
         $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);
     }
 }