[#4962] Updated code to use ControllerManager

- Original commit adds the alias for ControllerManager; this commit updates code to use that alias. Some tests needed to be updated as well.
zendframework · Oct 23, 2013 · 7ab9530 · 7ab9530
1 parent e0e5aa6
commit 7ab9530
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/library/Zend/Mvc/Controller/Plugin/Service/ForwardFactory.php b/library/Zend/Mvc/Controller/Plugin/Service/ForwardFactory.php
@@ -20,7 +20,7 @@ class ForwardFactory implements FactoryInterface
      * {@inheritDoc}
      *
      * @return Forward
-     * @throws ServiceNotCreatedException if ControllerLoader service is not found in application service locator
+     * @throws ServiceNotCreatedException if Controllermanager service is not found in application service locator
      */
     public function createService(ServiceLocatorInterface $plugins)
     {
@@ -32,14 +32,14 @@ public function createService(ServiceLocatorInterface $plugins)
             ));
         }
 
-        if (!$services->has('ControllerLoader')) {
+        if (!$services->has('ControllerManager')) {
             throw new ServiceNotCreatedException(sprintf(
                 '%s requires that the application service manager contains a "%s" service; none found',
                 __CLASS__,
-                'ControllerLoader'
+                'ControllerManager'
             ));
         }
-        $controllers = $services->get('ControllerLoader');
+        $controllers = $services->get('ControllerManager');
 
         return new Forward($controllers);
     }

diff --git a/library/Zend/Mvc/DispatchListener.php b/library/Zend/Mvc/DispatchListener.php
@@ -19,7 +19,7 @@
 /**
  * Default dispatch listener
  *
- * Pulls controllers from the service manager's "ControllerLoader" service.
+ * Pulls controllers from the service manager's "ControllerManager" service.
  *
  * If the controller cannot be found a "404" result is set up. Otherwise it
  * will continue to try to load the controller.
@@ -86,7 +86,7 @@ public function onDispatch(MvcEvent $e)
         $controllerName   = $routeMatch->getParam('controller', 'not-found');
         $application      = $e->getApplication();
         $events           = $application->getEventManager();
-        $controllerLoader = $application->getServiceManager()->get('ControllerLoader');
+        $controllerLoader = $application->getServiceManager()->get('ControllerManager');
 
         if (!$controllerLoader->has($controllerName)) {
             $return = $this->marshalControllerNotFoundEvent($application::ERROR_CONTROLLER_NOT_FOUND, $controllerName, $e, $application);

diff --git a/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php b/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -462,7 +462,7 @@ protected function getControllerFullClassName()
     {
         $routeMatch           = $this->getApplication()->getMvcEvent()->getRouteMatch();
         $controllerIdentifier = $routeMatch->getParam('controller');
-        $controllerManager    = $this->getApplicationServiceLocator()->get('ControllerLoader');
+        $controllerManager    = $this->getApplicationServiceLocator()->get('ControllerManager');
         $controllerClass      = $controllerManager->get($controllerIdentifier);
         return get_class($controllerClass);
     }

diff --git a/tests/ZendTest/Mvc/ApplicationTest.php b/tests/ZendTest/Mvc/ApplicationTest.php
@@ -81,6 +81,7 @@ public function setUp()
                 'aliases' => array(
                     'Router'                 => 'HttpRouter',
                     'Configuration'          => 'Config',
+                    'ControllerManager'      => 'ControllerLoader',
                 ),
             ))
         );

diff --git a/tests/ZendTest/Mvc/Controller/Plugin/ForwardTest.php b/tests/ZendTest/Mvc/Controller/Plugin/ForwardTest.php
@@ -58,9 +58,11 @@ public function setUp()
             return $controller;
         });
         $controllers->setServiceLocator($services);
-        $services->add('ControllerLoader', function () use ($controllers) {
+        $controllerLoader = function () use ($controllers) {
             return $controllers;
-        });
+        };
+        $services->add('ControllerLoader', $controllerLoader);
+        $services->add('ControllerManager', $controllerLoader);
         $services->add('ControllerPluginManager', function () use ($plugins) {
             return $plugins;
         });

diff --git a/tests/ZendTest/Mvc/DispatchListenerTest.php b/tests/ZendTest/Mvc/DispatchListenerTest.php
@@ -68,6 +68,7 @@ public function setUp()
                 'aliases' => array(
                     'Router'                 => 'HttpRouter',
                     'Configuration'          => 'Config',
+                    'ControllerManager'      => 'ControllerLoader',
                 ),
             ))
         );