Update events to use new methods.

The attach()/detach() methods are deprecated and the internals should use the new methods.
cakephp · Feb 5, 2015 · 95fe338 · 95fe338
1 parent c9109bb
commit 95fe338
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 21 deletions.
diff --git a/src/Controller/Component/AuthComponent.php b/src/Controller/Component/AuthComponent.php
@@ -782,7 +782,7 @@ public function constructAuthenticate()
             }
             $config = array_merge($global, (array)$config);
             $this->_authenticateObjects[$alias] = new $className($this->_registry, $config);
-            $this->eventManager()->attach($this->_authenticateObjects[$alias]);
+            $this->eventManager()->on($this->_authenticateObjects[$alias]);
         }
         return $this->_authenticateObjects;
     }

diff --git a/src/Controller/ComponentRegistry.php b/src/Controller/ComponentRegistry.php
@@ -106,7 +106,7 @@ protected function _create($class, $alias, $config)
         $instance = new $class($this, $config);
         $enable = isset($config['enabled']) ? $config['enabled'] : true;
         if ($enable) {
-            $this->eventManager()->attach($instance);
+            $this->eventManager()->on($instance);
         }
         return $instance;
     }

diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
@@ -287,7 +287,7 @@ public function __construct(Request $request = null, Response $response = null,
 
         $this->_mergeControllerVars();
         $this->_loadComponents();
-        $this->eventManager()->attach($this);
+        $this->eventManager()->on($this);
     }
 
     /**

diff --git a/src/Controller/ErrorController.php b/src/Controller/ErrorController.php
@@ -40,10 +40,10 @@ public function __construct($request = null, $response = null)
         }
         $eventManager = $this->eventManager();
         if (isset($this->Auth)) {
-            $eventManager->detach($this->Auth);
+            $eventManager->off($this->Auth);
         }
         if (isset($this->Security)) {
-            $eventManager->detach($this->Security);
+            $eventManager->off($this->Security);
         }
         $this->viewPath = 'Error';
     }

diff --git a/src/Core/ObjectRegistry.php b/src/Core/ObjectRegistry.php
@@ -301,7 +301,7 @@ public function unload($objectName)
         }
         $object = $this->_loaded[$objectName];
         if (isset($this->_eventManager)) {
-            $this->eventManager()->detach($object);
+            $this->eventManager()->off($object);
         }
         unset($this->_loaded[$objectName]);
     }

diff --git a/src/Event/EventManager.php b/src/Event/EventManager.php
@@ -311,13 +311,13 @@ protected function _detachSubscriber(EventListenerInterface $subscriber, $eventK
                 if (is_numeric(key($function))) {
                     foreach ($function as $handler) {
                         $handler = isset($handler['callable']) ? $handler['callable'] : $handler;
-                        $this->detach([$subscriber, $handler], $key);
+                        $this->off($key, [$subscriber, $handler]);
                     }
                     continue;
                 }
                 $function = $function['callable'];
             }
-            $this->detach([$subscriber, $function], $key);
+            $this->off($key, [$subscriber, $function]);
         }
     }
 

diff --git a/src/Event/README.md b/src/Event/README.md
@@ -31,7 +31,7 @@ class Orders
 }
 
 $orders = new Orders();
-$orders->eventManager()->attach(function ($event) {
+$orders->eventManager()->on(function ($event) {
 	// Do something after the order was placed
 	...
 }, 'Orders.afterPlace');

diff --git a/src/ORM/BehaviorRegistry.php b/src/ORM/BehaviorRegistry.php
@@ -117,7 +117,7 @@ protected function _create($class, $alias, $config)
         $instance = new $class($this->_table, $config);
         $enable = isset($config['enabled']) ? $config['enabled'] : true;
         if ($enable) {
-            $this->eventManager()->attach($instance);
+            $this->eventManager()->on($instance);
         }
         $methods = $this->_getMethods($instance, $class, $alias);
         $this->_methodMap += $methods['methods'];

diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -248,7 +248,7 @@ public function __construct(array $config = [])
         $this->_associations = $associations ?: new AssociationCollection();
 
         $this->initialize($config);
-        $this->_eventManager->attach($this);
+        $this->_eventManager->on($this);
         $this->dispatchEvent('Model.initialize');
     }
 

diff --git a/src/Routing/Dispatcher.php b/src/Routing/Dispatcher.php
@@ -143,7 +143,7 @@ protected function _invoke(Controller $controller)
     public function addFilter(EventListenerInterface $filter)
     {
         $this->_filters[] = $filter;
-        $this->eventManager()->attach($filter);
+        $this->eventManager()->on($filter);
     }
 
     /**

diff --git a/src/TestSuite/IntegrationTestCase.php b/src/TestSuite/IntegrationTestCase.php
@@ -267,10 +267,10 @@ protected function _sendRequest($url, $method, $data = [])
         $request = $this->_buildRequest($url, $method, $data);
         $response = new Response();
         $dispatcher = DispatcherFactory::create();
-        $dispatcher->eventManager()->attach(
-            [$this, 'controllerSpy'],
+        $dispatcher->eventManager()->on(
             'Dispatcher.beforeDispatch',
-            ['priority' => 999]
+            ['priority' => 999],
+            [$this, 'controllerSpy']
         );
         try {
             $dispatcher->dispatch($request, $response);
@@ -296,12 +296,12 @@ public function controllerSpy($event)
         }
         $this->_controller = $event->data['controller'];
         $events = $this->_controller->eventManager();
-        $events->attach(function ($event, $viewFile) {
+        $events->on('View.beforeRender', function ($event, $viewFile) {
             $this->_viewName = $viewFile;
-        }, 'View.beforeRender');
-        $events->attach(function ($event, $viewFile) {
+        });
+        $events->on('View.beforeLayout', function ($event, $viewFile) {
             $this->_layoutName = $viewFile;
-        }, 'View.beforeLayout');
+        });
     }
 
     /**

diff --git a/src/View/HelperRegistry.php b/src/View/HelperRegistry.php
@@ -146,7 +146,7 @@ protected function _create($class, $alias, $settings)
         }
         $enable = isset($settings['enabled']) ? $settings['enabled'] : true;
         if ($enable) {
-            $this->eventManager()->attach($instance);
+            $this->eventManager()->on($instance);
         }
         return $instance;
     }

diff --git a/tests/TestCase/Controller/ComponentTest.php b/tests/TestCase/Controller/ComponentTest.php
@@ -85,7 +85,7 @@ public function testInnerComponentsAreNotEnabled()
         $controller->eventManager($mock);
 
         $mock->expects($this->once())
-            ->method('attach')
+            ->method('on')
             ->with($this->isInstanceOf('TestApp\Controller\Component\AppleComponent'));
 
         $Collection = new ComponentRegistry($controller);