Make sure $object implements EventListenerInterface.

cakephp · May 4, 2015 · 62e1e2a · 62e1e2a
1 parent 52feab2
commit 62e1e2a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Core/ObjectRegistry.php b/src/Core/ObjectRegistry.php
@@ -14,6 +14,7 @@
  */
 namespace Cake\Core;
 
+use Cake\Event\EventListenerInterface;
 use RuntimeException;
 
 /**
@@ -277,7 +278,7 @@ public function set($objectName, $object)
     {
         list(, $name) = pluginSplit($objectName);
         $this->unload($objectName);
-        if (isset($this->_eventManager)) {
+        if (isset($this->_eventManager) && $object instanceof EventListenerInterface) {
             $this->eventManager()->attach($object);
         }
         $this->_loaded[$name] = $object;
@@ -297,7 +298,7 @@ public function unload($objectName)
             return;
         }
         $object = $this->_loaded[$objectName];
-        if (isset($this->_eventManager)) {
+        if (isset($this->_eventManager) && $object instanceof EventListenerInterface) {
             $this->eventManager()->off($object);
         }
         unset($this->_loaded[$objectName]);