Fixed failing tests and incorrect factories

- Because we register services under both the names 'application' and
  'Application' normally, we need to do both in tests as well.
- The various factories in ViewHelperManagerFactory were incorrect;
  `$services` as passed to each is guaranteed to be the application
  service manager instance, so the conditionals that were pulling the
  parent were unnecessary.

Author: weierophinney

src/Service/ViewHelperManagerFactory.php

@@ -129,11 +129,6 @@ private function injectOverrideFactories(HelperPluginManager $plugins, Container
     private function createUrlHelperFactory(ContainerInterface $services)
     {
         return function () use ($services) {
-            // zend-servicemanager v2: fetch parent locator
-            if (method_exists($services, 'getServiceLocator') && ! method_exists($services, 'configure')) {
-                $services = $services->getServiceLocator() ?: $services;
-            }
-
             $helper = new ViewHelper\Url;
             $router = Console::isConsole() ? 'HttpRouter' : 'Router';
             $helper->setRouter($services->get($router));
@@ -162,11 +157,6 @@ private function createUrlHelperFactory(ContainerInterface $services)
     private function createBasePathHelperFactory(ContainerInterface $services)
     {
         return function () use ($services) {
-            // zend-servicemanager v2: fetch parent locator
-            if (method_exists($services, 'getServiceLocator') && ! method_exists($services, 'configure')) {
-                $services = $services->getServiceLocator() ?: $services;
-            }
-
             $config = $services->has('config') ? $services->get('config') : [];
             $helper = new ViewHelper\BasePath;
 
@@ -204,11 +194,6 @@ private function createBasePathHelperFactory(ContainerInterface $services)
     private function createDoctypeHelperFactory(ContainerInterface $services)
     {
         return function () use ($services) {
-            // zend-servicemanager v2: fetch parent locator
-            if (method_exists($services, 'getServiceLocator') && ! method_exists($services, 'configure')) {
-                $services = $services->getServiceLocator() ?: $services;
-            }
-
             $config = $services->has('config') ? $services->get('config') : [];
             $config = isset($config['view_manager']) ? $config['view_manager'] : [];
             $helper = new ViewHelper\Doctype;

test/Service/ViewHelperManagerFactoryTest.php

@@ -124,6 +124,7 @@ public function testUrlHelperFactoryCanBeInvokedViaShortNameOrFullClassName($nam
         $this->services->setService('HttpRouter', $router);
         $this->services->setService('Router', $router);
         $this->services->setService('application', $application->reveal());
+        $this->services->setService('Application', $application->reveal());
         $this->services->setService('config', []);
 
         $manager = $this->factory->createService($this->services);