Merge branch 'hotfix/152' into release-2.7

Close #152

Author: weierophinney

CHANGELOG.md

@@ -22,6 +22,10 @@ All notable changes to this project will be documented in this file, in reverse
   - `Zend\Mvc\Service\DiServiceInitializerFactory`
   - `Zend\Mvc\Service\DiStrictAbstractServiceFactory`
   - `Zend\Mvc\Service\DiStrictAbstractServiceFactoryFactory`
+- [#152](https://github.com/zendframework/zend-mvc/pull/152) formally marks the
+  `ControllerLoaderFactory` as deprecated via annotation (though it has been
+  noted as such in the documentation for several years). Use
+  `Zend\Mvc\Service\ControllerManagerFactory` instead.
 
 ### Removed
 

src/Service/ControllerLoaderFactory.php

@@ -13,6 +13,11 @@
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
+/**
+ * @see \Zend\Mvc\Service\ControllerManagerFactory
+ * @deprecated please use Zend\Mvc\Service\ControllerManagerFactory instead;
+ *     this class will be removed in release 3.0
+ */
 class ControllerLoaderFactory implements FactoryInterface
 {
     /**
@@ -33,8 +38,13 @@ class ControllerLoaderFactory implements FactoryInterface
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        $controllerLoader = new ControllerManager();
-        $controllerLoader->setServiceLocator($serviceLocator);
+        trigger_error(sprintf(
+            '%s is deprecated; please use %s instead',
+            __CLASS__,
+            ControllerManagerFactory::class
+        ), E_USER_DEPRECATED);
+
+        $controllerLoader = new ControllerManager($serviceLocator);
         $controllerLoader->addPeeringServiceManager($serviceLocator);
 
         $config = $serviceLocator->get('Config');