Make registries implement EventDispatcherInterface.

src/Controller/ComponentRegistry.php

@@ -17,14 +17,15 @@
 use Cake\Controller\Exception\MissingComponentException;
 use Cake\Core\App;
 use Cake\Core\ObjectRegistry;
+use Cake\Event\EventDispatcherInterface;
 use Cake\Event\EventManagerTrait;
 
 /**
  * ComponentRegistry is a registry for loaded components
  *
  * Handles loading, constructing and binding events for component class objects.
  */
-class ComponentRegistry extends ObjectRegistry
+class ComponentRegistry extends ObjectRegistry implements EventDispatcherInterface
 {
 
     use EventManagerTrait;

src/Core/ObjectRegistry.php

@@ -14,6 +14,7 @@
  */
 namespace Cake\Core;
 
+use Cake\Event\EventDispatcherInterface;
 use Cake\Event\EventListenerInterface;
 use RuntimeException;
 
@@ -281,7 +282,7 @@ public function set($objectName, $object)
     {
         list(, $name) = pluginSplit($objectName);
         $this->unload($objectName);
-        if (isset($this->_eventManager) && $object instanceof EventListenerInterface) {
+        if ($this instanceof EventDispatcherInterface && $object instanceof EventListenerInterface) {
             $this->eventManager()->on($object);
         }
         $this->_loaded[$name] = $object;
@@ -301,7 +302,7 @@ public function unload($objectName)
             return;
         }
         $object = $this->_loaded[$objectName];
-        if (isset($this->_eventManager) && $object instanceof EventListenerInterface) {
+        if ($this instanceof EventDispatcherInterface && $object instanceof EventListenerInterface) {
             $this->eventManager()->off($object);
         }
         unset($this->_loaded[$objectName]);

src/ORM/BehaviorRegistry.php

@@ -17,6 +17,7 @@
 use BadMethodCallException;
 use Cake\Core\App;
 use Cake\Core\ObjectRegistry;
+use Cake\Event\EventDispatcherInterface;
 use Cake\Event\EventManagerTrait;
 use Cake\ORM\Behavior;
 use Cake\ORM\Exception\MissingBehaviorException;
@@ -29,7 +30,7 @@
  *
  * This class also provides method for checking and dispatching behavior methods.
  */
-class BehaviorRegistry extends ObjectRegistry
+class BehaviorRegistry extends ObjectRegistry implements EventDispatcherInterface
 {
 
     use EventManagerTrait;

src/View/HelperRegistry.php

@@ -16,14 +16,15 @@
 
 use Cake\Core\App;
 use Cake\Core\ObjectRegistry;
+use Cake\Event\EventDispatcherInterface;
 use Cake\Event\EventManagerTrait;
 use Cake\View\View;
 
 /**
  * HelperRegistry is used as a registry for loaded helpers and handles loading
  * and constructing helper class objects.
  */
-class HelperRegistry extends ObjectRegistry
+class HelperRegistry extends ObjectRegistry implements EventDispatcherInterface
 {
 
     use EventManagerTrait;