Merge pull request #152 from webimpress/hotfix/152

ControllerLoaderFactory fix + deprecated (v2)

Author: weierophinney

src/Service/ControllerLoaderFactory.php

@@ -13,6 +13,10 @@
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
+/**
+ * @deprecated please use the {@see \Zend\Mvc\Service\ControllerManagerFactory} factory instead:
+ *             this class will be removed in release 3.0
+ */
 class ControllerLoaderFactory implements FactoryInterface
 {
     /**
@@ -33,8 +37,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');