Remove event manager v2 support

Author: snapshotpl

test/Controller/ActionControllerTest.php

@@ -10,15 +10,16 @@
 namespace ZendTest\Mvc\Controller;
 
 use PHPUnit_Framework_TestCase as TestCase;
-use ReflectionClass;
 use Zend\EventManager\EventManager;
 use Zend\EventManager\SharedEventManager;
+use Zend\EventManager\SharedEventManagerInterface;
 use Zend\Http\Request;
 use Zend\Http\Response;
 use Zend\Mvc\Controller\PluginManager;
 use Zend\Mvc\MvcEvent;
 use Zend\Router\RouteMatch;
 use Zend\ServiceManager\ServiceManager;
+use ZendTest\Mvc\Controller\TestAsset\SampleController;
 
 class ActionControllerTest extends TestCase
 {
@@ -29,7 +30,7 @@ class ActionControllerTest extends TestCase
 
     public function setUp()
     {
-        $this->controller = new TestAsset\SampleController();
+        $this->controller = new SampleController();
         $this->request    = new Request();
         $this->response   = null;
         $this->routeMatch = new RouteMatch(['controller' => 'controller-sample']);
@@ -43,21 +44,11 @@ public function setUp()
     }
 
     /**
-     * Create an event manager instance based on zend-eventmanager version
-     *
      * @param SharedEventManager
      * @return EventManager
      */
-    protected function createEventManager($sharedManager)
+    protected function createEventManager(SharedEventManagerInterface $sharedManager)
     {
-        $r = new ReflectionClass(EventManager::class);
-
-        if ($r->hasMethod('setSharedManager')) {
-            $events = new EventManager();
-            $events->setSharedManager($sharedManager);
-            return $events;
-        }
-
         return new EventManager($sharedManager);
     }
 

test/Controller/ControllerManagerTest.php

@@ -10,13 +10,14 @@
 namespace ZendTest\Mvc\Controller;
 
 use PHPUnit_Framework_TestCase as TestCase;
-use ReflectionClass;
 use Zend\EventManager\EventManager;
 use Zend\EventManager\SharedEventManager;
+use Zend\EventManager\SharedEventManagerInterface;
 use Zend\Mvc\Controller\ControllerManager;
 use Zend\Mvc\Controller\PluginManager as ControllerPluginManager;
 use Zend\ServiceManager\Config;
 use Zend\ServiceManager\ServiceManager;
+use ZendTest\Mvc\Controller\TestAsset\SampleController;
 
 class ControllerManagerTest extends TestCase
 {
@@ -42,27 +43,17 @@ public function setUp()
     }
 
     /**
-     * Create an event manager instance based on zend-eventmanager version
-     *
      * @param SharedEventManager
      * @return EventManager
      */
-    protected function createEventManager($sharedManager)
+    protected function createEventManager(SharedEventManagerInterface $sharedManager)
     {
-        $r = new ReflectionClass(EventManager::class);
-
-        if ($r->hasMethod('setSharedManager')) {
-            $events = new EventManager();
-            $events->setSharedManager($sharedManager);
-            return $events;
-        }
-
         return new EventManager($sharedManager);
     }
 
     public function testCanInjectEventManager()
     {
-        $controller = new TestAsset\SampleController();
+        $controller = new SampleController();
 
         $this->controllers->injectEventManager($this->services, $controller);
 
@@ -76,7 +67,7 @@ public function testCanInjectEventManager()
 
     public function testCanInjectPluginManager()
     {
-        $controller = new TestAsset\SampleController();
+        $controller = new SampleController();
 
         $this->controllers->injectPluginManager($this->services, $controller);
 
@@ -86,7 +77,7 @@ public function testCanInjectPluginManager()
     public function testInjectEventManagerWillNotOverwriteExistingEventManagerIfItAlreadyHasASharedManager()
     {
         $events     = $this->createEventManager($this->sharedEvents);
-        $controller = new TestAsset\SampleController();
+        $controller = new SampleController();
         $controller->setEventManager($events);
 
         $this->controllers->injectEventManager($this->services, $controller);

test/Controller/Plugin/ForwardTest.php

@@ -10,7 +10,6 @@
 namespace ZendTest\Mvc\Controller\Plugin;
 
 use PHPUnit_Framework_TestCase as TestCase;
-use ReflectionClass;
 use stdClass;
 use Zend\EventManager\EventManager;
 use Zend\EventManager\SharedEventManager;
@@ -113,21 +112,11 @@ public function setUp()
     }
 
     /**
-     * Create an event manager instance based on zend-eventmanager version
-     *
      * @param SharedEventManager
      * @return EventManager
      */
-    protected function createEventManager($sharedManager)
+    protected function createEventManager(SharedEventManagerInterface $sharedManager)
     {
-        $r = new ReflectionClass(EventManager::class);
-
-        if ($r->hasMethod('setSharedManager')) {
-            $events = new EventManager();
-            $events->setSharedManager($sharedManager);
-            return $events;
-        }
-
         return new EventManager($sharedManager);
     }
 

test/Controller/RestfulControllerTest.php

@@ -10,15 +10,18 @@
 namespace ZendTest\Mvc\Controller;
 
 use PHPUnit_Framework_TestCase as TestCase;
-use ReflectionClass;
 use ReflectionObject;
 use stdClass;
 use Zend\EventManager\EventManager;
 use Zend\EventManager\SharedEventManager;
+use Zend\EventManager\SharedEventManagerInterface;
 use Zend\Http\Response;
 use Zend\Mvc\MvcEvent;
 use Zend\Router\RouteMatch;
+use ZendTest\Mvc\Controller\TestAsset\Request;
 use ZendTest\Mvc\Controller\TestAsset\RestfulContentTypeTestController;
+use ZendTest\Mvc\Controller\TestAsset\RestfulMethodNotAllowedTestController;
+use ZendTest\Mvc\Controller\TestAsset\RestfulTestController;
 
 class RestfulControllerTest extends TestCase
 {
@@ -31,9 +34,9 @@ class RestfulControllerTest extends TestCase
 
     public function setUp()
     {
-        $this->controller      = new TestAsset\RestfulTestController();
-        $this->emptyController = new TestAsset\RestfulMethodNotAllowedTestController();
-        $this->request         = new TestAsset\Request();
+        $this->controller      = new RestfulTestController();
+        $this->emptyController = new RestfulMethodNotAllowedTestController();
+        $this->request         = new Request();
         $this->response        = new Response();
         $this->routeMatch      = new RouteMatch(['controller' => 'controller-restful']);
         $this->event           = new MvcEvent;
@@ -47,21 +50,11 @@ public function setUp()
     }
 
     /**
-     * Create an event manager instance based on zend-eventmanager version
-     *
      * @param SharedEventManager
      * @return EventManager
      */
-    protected function createEventManager($sharedManager)
+    protected function createEventManager(SharedEventManagerInterface $sharedManager)
     {
-        $r = new ReflectionClass(EventManager::class);
-
-        if ($r->hasMethod('setSharedManager')) {
-            $events = new EventManager();
-            $events->setSharedManager($sharedManager);
-            return $events;
-        }
-
         return new EventManager($sharedManager);
     }
 
@@ -428,7 +421,7 @@ public function matchingContentTypes()
     public function testRequestingContentTypeReturnsTrueForValidMatches($contentType)
     {
         $this->request->getHeaders()->addHeaderLine('Content-Type', $contentType);
-        $this->assertTrue($this->controller->requestHasContentType($this->request, TestAsset\RestfulTestController::CONTENT_TYPE_JSON));
+        $this->assertTrue($this->controller->requestHasContentType($this->request, RestfulTestController::CONTENT_TYPE_JSON));
     }
 
     public function nonMatchingContentTypes()
@@ -445,7 +438,7 @@ public function nonMatchingContentTypes()
     public function testRequestingContentTypeReturnsFalseForInvalidMatches($contentType)
     {
         $this->request->getHeaders()->addHeaderLine('Content-Type', $contentType);
-        $this->assertFalse($this->controller->requestHasContentType($this->request, TestAsset\RestfulTestController::CONTENT_TYPE_JSON));
+        $this->assertFalse($this->controller->requestHasContentType($this->request, RestfulTestController::CONTENT_TYPE_JSON));
     }
 
     public function testDispatchWithUnrecognizedMethodReturns405Response()

test/Service/ServiceManagerConfigTest.php

@@ -10,12 +10,13 @@
 namespace ZendTest\Mvc\Service;
 
 use PHPUnit_Framework_TestCase as TestCase;
-use ReflectionClass;
 use stdClass;
 use Zend\EventManager\EventManager;
+use Zend\EventManager\SharedEventManagerInterface;
 use Zend\Mvc\Service\ServiceManagerConfig;
 use Zend\ServiceManager\Factory\InvokableFactory;
 use Zend\ServiceManager\ServiceManager;
+use ZendTest\Mvc\Service\TestAsset\EventManagerAwareObject;
 
 /**
  * @covers \Zend\Mvc\Service\ServiceManagerConfig
@@ -43,21 +44,11 @@ protected function setUp()
     }
 
     /**
-     * Create an event manager instance based on zend-eventmanager version
-     *
-     * @param null|\Zend\EventManager\SharedEventManagerInterface
+     * @param null|SharedEventManagerInterface
      * @return EventManager
      */
-    protected function createEventManager($sharedManager = null)
+    protected function createEventManager(SharedEventManagerInterface $sharedManager = null)
     {
-        $r = new ReflectionClass(EventManager::class);
-
-        if ($r->hasMethod('setSharedManager')) {
-            $events = new EventManager();
-            $events->setSharedManager($sharedManager ?: $this->services->get('SharedEventManager'));
-            return $events;
-        }
-
         return new EventManager($sharedManager ?: $this->services->get('SharedEventManager'));
     }
 
@@ -67,13 +58,13 @@ protected function createEventManager($sharedManager = null)
     public function testEventManagerAwareInterfaceIsNotInjectedIfPresentButSharedManagerIs()
     {
         $events = $this->createEventManager();
-        TestAsset\EventManagerAwareObject::$defaultEvents = $events;
+        EventManagerAwareObject::$defaultEvents = $events;
 
-        $this->services->setAlias('EventManagerAwareObject', TestAsset\EventManagerAwareObject::class);
-        $this->services->setFactory(TestAsset\EventManagerAwareObject::class, InvokableFactory::class);
+        $this->services->setAlias('EventManagerAwareObject', EventManagerAwareObject::class);
+        $this->services->setFactory(EventManagerAwareObject::class, InvokableFactory::class);
 
         $instance = $this->services->get('EventManagerAwareObject');
-        $this->assertInstanceOf(TestAsset\EventManagerAwareObject::class, $instance);
+        $this->assertInstanceOf(EventManagerAwareObject::class, $instance);
         $this->assertSame($events, $instance->getEventManager());
         $this->assertSame($this->services->get('SharedEventManager'), $events->getSharedManager());
     }