Merge branch 'hotfix/5146'

Close zendframework/zendframework#5146
Fixes zendframework/zendframework#3035

src/Listener/LocatorRegistrationListener.php

@@ -69,10 +69,12 @@ public function onLoadModules(Event $e)
         // Shared instance for module manager
         $events->attach('Zend\Mvc\Application', MvcEvent::EVENT_BOOTSTRAP, function ($e) use ($moduleManager) {
             $moduleClassName = get_class($moduleManager);
+            $moduleClassNameArray = explode('\\', $moduleClassName);
+            $moduleClassNameAlias = end($moduleClassNameArray);
             $application     = $e->getApplication();
             $services        = $application->getServiceManager();
             if (!$services->has($moduleClassName)) {
-                $services->setService($moduleClassName, $moduleManager);
+                $services->setAlias($moduleClassName, $moduleClassNameAlias);
             }
         }, 1000);
 

test/Listener/LocatorRegistrationListenerTest.php

@@ -121,4 +121,23 @@ public function testModuleClassIsRegisteredWithDiAndInjectedWithSharedInstances(
         $this->assertInstanceOf('Zend\ModuleManager\ModuleManager', $sharedInstance2);
         $this->assertSame($this->moduleManager, $locator->get('Foo\Bar')->moduleManager);
     }
+
+    public function testNoDuplicateServicesAreDefinedForModuleManager()
+    {
+        $locatorRegistrationListener = new LocatorRegistrationListener;
+        $this->moduleManager->getEventManager()->attachAggregate($locatorRegistrationListener);
+
+        $this->moduleManager->loadModules();
+        $this->application->bootstrap();
+        $registeredServices = $this->application->getServiceManager()->getRegisteredServices();
+
+        $aliases = $registeredServices['aliases'];
+        $instances = $registeredServices['instances'];
+
+        $this->assertContains('zendmodulemanagermodulemanager', $aliases);
+        $this->assertFalse(in_array('modulemanager', $aliases));
+
+        $this->assertContains('modulemanager', $instances);
+        $this->assertFalse(in_array('zendmodulemanagermodulemanager', $instances));
+    }
 }