Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Adds an alias for ModuleManager and removes the duplicate service defini... #5146

Closed
wants to merge 2 commits into from
Closed

Adds an alias for ModuleManager and removes the duplicate service defini... #5146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3067f4
Adds an alias for ModuleManager and removes the duplicate service def…
Sep 19, 2013
73c3ccc
Adds unit test for ModuleManager duplicate service hotfix.
Oct 23, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
View file
Open in desktop
Expand Up @@ -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);

Expand Down
19 changes: 19 additions & 0 deletions tests/ZendTest/ModuleManager/Listener/LocatorRegistrationListenerTest.php
View file
Open in desktop
Expand Up @@ -122,4 +122,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));
}
}