Apply setEventManager() in src.

cakephp · Apr 21, 2017 · a95249a · a95249a
1 parent babd5c4
commit a95249a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 8 deletions.
diff --git a/src/Controller/Component/AuthComponent.php b/src/Controller/Component/AuthComponent.php
@@ -252,7 +252,7 @@ class AuthComponent extends Component
     public function initialize(array $config)
     {
         $controller = $this->_registry->getController();
-        $this->eventManager($controller->getEventManager());
+        $this->setEventManager($controller->getEventManager());
         $this->response =& $controller->response;
         $this->session = $controller->request->getSession();
     }

diff --git a/src/Controller/ComponentRegistry.php b/src/Controller/ComponentRegistry.php
@@ -68,7 +68,7 @@ public function getController()
     public function setController(Controller $controller)
     {
         $this->_Controller = $controller;
-        $this->eventManager($controller->getEventManager());
+        $this->setEventManager($controller->getEventManager());
     }
 
     /**

diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
@@ -248,7 +248,7 @@ public function __construct(ServerRequest $request = null, Response $response =
         $this->response = $response !== null ? $response : new Response();
 
         if ($eventManager !== null) {
-            $this->eventManager($eventManager);
+            $this->setEventManager($eventManager);
         }
 
         $this->modelFactory('Table', [$this->tableLocator(), 'get']);

diff --git a/src/Http/ActionDispatcher.php b/src/Http/ActionDispatcher.php
@@ -55,7 +55,7 @@ class ActionDispatcher
     public function __construct($factory = null, $eventManager = null, array $filters = [])
     {
         if ($eventManager) {
-            $this->eventManager($eventManager);
+            $this->setEventManager($eventManager);
         }
         foreach ($filters as $filter) {
             $this->addFilter($filter);

diff --git a/src/ORM/BehaviorRegistry.php b/src/ORM/BehaviorRegistry.php
@@ -75,7 +75,10 @@ public function __construct($table = null)
     public function setTable(Table $table)
     {
         $this->_table = $table;
-        $this->eventManager($table->getEventManager());
+        $eventManager = $table->getEventManager();
+        if ($eventManager !== null) {
+            $this->setEventManager($eventManager);
+        }
     }
 
     /**

diff --git a/src/View/Cell.php b/src/View/Cell.php
@@ -144,7 +144,9 @@ public function __construct(
         EventManager $eventManager = null,
         array $cellOptions = []
     ) {
-        $this->eventManager($eventManager);
+        if ($eventManager !== null) {
+            $this->setEventManager($eventManager);
+        }
         $this->request = $request;
         $this->response = $response;
         $this->modelFactory('Table', [$this->tableLocator(), 'get']);

diff --git a/src/View/HelperRegistry.php b/src/View/HelperRegistry.php
@@ -44,7 +44,7 @@ class HelperRegistry extends ObjectRegistry implements EventDispatcherInterface
     public function __construct(View $view)
     {
         $this->_View = $view;
-        $this->eventManager($view->getEventManager());
+        $this->setEventManager($view->getEventManager());
     }
 
     /**

diff --git a/src/View/View.php b/src/View/View.php
@@ -333,7 +333,9 @@ public function __construct(
                 $this->{$var} = $viewOptions[$var];
             }
         }
-        $this->eventManager($eventManager);
+        if ($eventManager !== null) {
+            $this->setEventManager($eventManager);
+        }
         $this->request = $request ?: Router::getRequest(true);
         $this->response = $response ?: new Response();
         if (!$this->request) {