Merge pull request zendframework#80 from samsonasik/patch-1

Fixes zendframework#78 : using uppercase for 'Application' service
weierophinney · Feb 29, 2016 · b8bf785 · b8bf785
2 parents ae54c5f + bc4a2b4
commit b8bf785
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Service/ServiceListenerFactory.php b/src/Service/ServiceListenerFactory.php
@@ -66,6 +66,7 @@ class ServiceListenerFactory implements FactoryInterface
         'invokables' => [],
         'factories'  => [
             'Application'                    => 'Zend\Mvc\Service\ApplicationFactory',
+            'application'                    => 'Zend\Mvc\Service\ApplicationFactory',
             'config'                         => 'Zend\Mvc\Service\ConfigFactory',
             'ControllerManager'              => 'Zend\Mvc\Service\ControllerManagerFactory',
             'ControllerPluginManager'        => 'Zend\Mvc\Service\ControllerPluginManagerFactory',

diff --git a/src/Service/ViewHelperManagerFactory.php b/src/Service/ViewHelperManagerFactory.php
@@ -138,7 +138,7 @@ private function createUrlHelperFactory(ContainerInterface $services)
             $router = Console::isConsole() ? 'HttpRouter' : 'Router';
             $helper->setRouter($services->get($router));
 
-            $match = $services->get('application')
+            $match = $services->get('Application')
                 ->getMvcEvent()
                 ->getRouteMatch()
             ;