Merge branch 'hotfix/86' into develop

Forward port #90

Author: weierophinney

CHANGELOG.md

@@ -36,7 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#90](https://github.com/zendframework/zend-mvc/pull/90) re-introduces the
+  various zend-di aliases and factories in `Zend\Mvc\Service\ServiceListenerFactory`,
+  which were accidently removed in the 2.7.0 release.
 
 ## 2.7.1 - 2016-03-02
 

src/Service/ServiceListenerFactory.php

@@ -47,6 +47,7 @@ class ServiceListenerFactory implements FactoryInterface
             'Console'                                    => 'ConsoleAdapter',
             'ConsoleDefaultRenderingStrategy'            => View\Console\DefaultRenderingStrategy::class,
             'ControllerLoader'                           => 'ControllerManager',
+            'Di'                                         => 'DependencyInjector',
             'HttpDefaultRenderingStrategy'               => View\Http\DefaultRenderingStrategy::class,
             'MiddlewareListener'                         => 'Zend\Mvc\MiddlewareListener',
             'RouteListener'                              => 'Zend\Mvc\RouteListener',
@@ -57,6 +58,7 @@ class ServiceListenerFactory implements FactoryInterface
             'ViewPhpRendererStrategy'                    => 'Zend\View\Strategy\PhpRendererStrategy',
             'ViewPhpRenderer'                            => 'Zend\View\Renderer\PhpRenderer',
             'ViewRenderer'                               => 'Zend\View\Renderer\PhpRenderer',
+            'Zend\Di\LocatorInterface'                   => 'DependencyInjector',
             'Zend\Form\Annotation\FormAnnotationBuilder' => 'FormAnnotationBuilder',
             'Zend\Mvc\Controller\PluginManager'          => 'ControllerPluginManager',
             'Zend\Mvc\View\Http\InjectTemplateListener'  => 'InjectTemplateListener',
@@ -77,6 +79,10 @@ class ServiceListenerFactory implements FactoryInterface
             'ConsoleRouter'                  => ConsoleRouterFactory::class,
             'ConsoleRouteNotFoundStrategy'   => ConsoleRouteNotFoundStrategyFactory::class,
             'ConsoleViewManager'             => 'Zend\Mvc\Service\ConsoleViewManagerFactory',
+            'DependencyInjector'             => DiFactory::class,
+            'DiAbstractServiceFactory'       => DiAbstractServiceFactoryFactory::class,
+            'DiServiceInitializer'           => DiServiceInitializerFactory::class,
+            'DiStrictAbstractServiceFactory' => DiStrictAbstractServiceFactoryFactory::class,
             'DispatchListener'               => 'Zend\Mvc\Service\DispatchListenerFactory',
             'FilterManager'                  => 'Zend\Mvc\Service\FilterManagerFactory',
             'FormAnnotationBuilder'          => 'Zend\Mvc\Service\FormAnnotationBuilderFactory',