Add full namespace identifier for controller events

zendframework · Feb 17, 2019 · b6c3c67 · b6c3c67
1 parent ff6971a
commit b6c3c67
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 7 deletions.
diff --git a/src/Controller/AbstractController.php b/src/Controller/AbstractController.php
@@ -148,13 +148,19 @@ public function setEventManager(EventManagerInterface $events)
     {
         $className = get_class($this);
 
-        $nsPos = strpos($className, '\\') ?: 0;
+        $identifiers = [
+            __CLASS__,
+            $className,
+        ];
+
+        $rightmostNsPos = strrpos($className, '\\');
+        if ($rightmostNsPos) {
+            $identifiers[] = strstr($className, '\\', true); // top namespace
+            $identifiers[] = substr($className, 0, $rightmostNsPos); // full namespace
+        }
+
         $events->setIdentifiers(array_merge(
-            [
-                __CLASS__,
-                $className,
-                substr($className, 0, $nsPos)
-            ],
+            $identifiers,
             array_values(class_implements($className)),
             (array) $this->eventIdentifier
         ));

diff --git a/test/Controller/AbstractControllerTest.php b/test/Controller/AbstractControllerTest.php
@@ -14,6 +14,7 @@
 use Zend\Mvc\Controller\AbstractController;
 use Zend\Mvc\InjectApplicationEventInterface;
 use Zend\Stdlib\DispatchableInterface;
+use ZendTest\Mvc\Controller\TestAsset\AbstractControllerStub;
 
 /**
  * @covers \Zend\Mvc\Controller\AbstractController
@@ -30,7 +31,7 @@ class AbstractControllerTest extends TestCase
      */
     protected function setUp()
     {
-        $this->controller = $this->getMockForAbstractClass(AbstractController::class);
+        $this->controller = new AbstractControllerStub();
     }
 
     /**
@@ -107,4 +108,22 @@ public function testSetEventManagerWithDefaultIdentifiersIncludesImplementedInte
 
         $this->controller->setEventManager($eventManager);
     }
+
+    public function testSetEventManagerWithDefaultIdentifiersIncludesExtendingClassNameAndNamespace()
+    {
+        /* @var $eventManager EventManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+        $eventManager = $this->createMock(EventManagerInterface::class);
+
+        $eventManager
+            ->expects($this->once())
+            ->method('setIdentifiers')
+            ->with($this->logicalAnd(
+                $this->contains(AbstractController::class),
+                $this->contains(AbstractControllerStub::class),
+                $this->contains('ZendTest'),
+                $this->contains('ZendTest\\Mvc\\Controller\\TestAsset')
+            ));
+
+        $this->controller->setEventManager($eventManager);
+    }
 }
diff --git a/test/Controller/TestAsset/AbstractControllerStub.php b/test/Controller/TestAsset/AbstractControllerStub.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-mvc for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-mvc/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Mvc\Controller\TestAsset;
+
+use Zend\Mvc\Controller\AbstractController;
+use Zend\Mvc\MvcEvent;
+
+class AbstractControllerStub extends AbstractController
+{
+    public function onDispatch(MvcEvent $e)
+    {
+        // noop
+    }
+}