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

Commit

Permalink
Merge branch
Browse files Browse the repository at this point in the history
  • Loading branch information
fdeleon committed Oct 31, 2013
141 parents 1c9aa26 + 7abe866 + d240b5c + 940c8ec + 3f85108 + 2e38381 + 027f505 + 5a2ba91 + 823b2d4 + 05c2a86 + fe05cd7 + 1009849 + e109317 + 4dff7e8 + ce0c75d + 6a82230 + 215e77c + 7e16a91 + 2493ed4 + 7ab2816 + 3d2db08 + 6fea908 + aad063e + 06319a5 + aee1ae3 + 412f870 + 9b0f1d4 + e8236b3 + 3e482af + 84d85f9 + 2edbf66 + 7b83fea + ae75c15 + 56429a2 + 3463608 + a990d75 + ed0260a + 40ce9ee + 540e95d + a1f3efa + b138336 + 0ac8011 + 498f096 + a002c09 + a72d069 + d696070 + 95b016c + f72f2a8 + 63f9aa4 + c62eb22 + 56ff1e4 + 17753e6 + 261ddba + 9c23ce8 + d2ea716 + 8a38d20 + 29c3c53 + 9681f39 + 7dc76e1 + 7e1a689 + f52efc3 + 5400ef9 + 2de31e5 + 5ef1929 + 5d57927 + fb86f9e + a0d3c0d + 754d50b + 9ae8ef7 + 80bb476 + 7a4072e + 1b4e215 + 9e453d7 + 1f0f6c3 + 512d4f8 + 702eefc + 1f67b00 + 7233001 + 4244857 + 163015b + fd694bc + a17a889 + 6aea729 + 1946426 + 0177483 + 27a94da + 8afdcae + 8e4ac91 + d060a98 + 725a039 + 4dc194c + 246b9e4 + 5207d60 + dbe0e62 + 429b268 + d48dc13 + afcf71c + 64397cc + 48ea5ac + b4afa2a + 11643c5 + cd431ca + 51b7c50 + 82247be + d2994aa + eaf4e29 + eeb69a6 + 3e3fff3 + c0a95c9 + 961798f + 57ae4ec + a4fa631 + 259684b + b38977d + 1a640d1 + e064a96 + 3913f14 + fe5e75d + 3085bbe + 8e7f807 + 09e57f8 + fd510c1 + 80c8682 + fc0c293 + 497c115 + 49df818 + d645847 + ee12220 + 9b92152 + 9059103 + a7a5529 + be06b37 + 590c66e + df27e78 + 1e31131 + adb430e + 6bab62b + 1b4822b + ae1f9f3 + 62f83fa + cec8933 commit 1822787
Show file tree
Hide file tree
Showing 33 changed files with 28 additions and 52 deletions.
4 changes: 3 additions & 1 deletion src/Listener/LocatorRegistrationListener.php
View file
Original file line number Diff line number Diff line change
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
2 changes: 1 addition & 1 deletion src/Listener/ServiceListener.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ protected function serviceConfigToArray($config)
if (!$config instanceof ServiceConfig) {
throw new Exception\RuntimeException(sprintf(
'Invalid service manager configuration class provided; received "%s", expected an instance of Zend\ServiceManager\Config',
$class
(is_object($config) ? get_class($config) : (is_scalar($config) ? $config : gettype($config)))
));
}

Expand Down
10 changes: 5 additions & 5 deletions src/ModuleEvent.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ class ModuleEvent extends Event
/**
* Module events triggered by eventmanager
*/
CONST EVENT_MERGE_CONFIG = 'mergeConfig';
CONST EVENT_LOAD_MODULES = 'loadModules';
CONST EVENT_LOAD_MODULE_RESOLVE = 'loadModule.resolve';
CONST EVENT_LOAD_MODULE = 'loadModule';
CONST EVENT_LOAD_MODULES_POST = 'loadModules.post';
const EVENT_MERGE_CONFIG = 'mergeConfig';
const EVENT_LOAD_MODULES = 'loadModules';
const EVENT_LOAD_MODULE_RESOLVE = 'loadModule.resolve';
const EVENT_LOAD_MODULE = 'loadModule';
const EVENT_LOAD_MODULES_POST = 'loadModules.post';

/**
* @var mixed
Expand Down
1 change: 0 additions & 1 deletion test/Listener/AutoloaderListenerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\Listener;
Expand Down
1 change: 0 additions & 1 deletion test/Listener/ConfigListenerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\Listener;
Expand Down
1 change: 0 additions & 1 deletion test/Listener/DefaultListenerAggregateTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\Listener;
Expand Down
1 change: 0 additions & 1 deletion test/Listener/InitTriggerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\Listener;
Expand Down
1 change: 0 additions & 1 deletion test/Listener/ListenerOptionsTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\Listener;
Expand Down
20 changes: 19 additions & 1 deletion test/Listener/LocatorRegistrationListenerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\Listener;
Expand Down Expand Up @@ -122,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));
}
}
1 change: 0 additions & 1 deletion test/Listener/ModuleDependencyCheckerListenerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\Listener;
Expand Down
1 change: 0 additions & 1 deletion test/Listener/ModuleLoaderListenerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\Listener;
Expand Down
1 change: 0 additions & 1 deletion test/Listener/ModuleResolverListenerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\Listener;
Expand Down
1 change: 0 additions & 1 deletion test/Listener/OnBootstrapListenerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\Listener;
Expand Down
1 change: 0 additions & 1 deletion test/Listener/ServiceListenerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\Listener;
Expand Down
6 changes: 0 additions & 6 deletions test/Listener/TestAsset/ServiceInvalidReturnModule.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\Listener\TestAsset;

use stdClass;

/**
* @category Zend
* @package Zend_ModuleManager
* @subpackage UnitTest
*/
class ServiceInvalidReturnModule
{
public function getServiceConfiguration()
Expand Down
6 changes: 0 additions & 6 deletions test/Listener/TestAsset/ServiceProviderModule.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\Listener\TestAsset;

/**
* @category Zend
* @package Zend_ModuleManager
* @subpackage UnitTest
*/
class ServiceProviderModule
{
public $config;
Expand Down
1 change: 0 additions & 1 deletion test/ModuleEventTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager;
Expand Down
1 change: 0 additions & 1 deletion test/ModuleManagerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/BadConfigModule/Module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace BadConfigModule;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/BafModule/Module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace BafModule;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/BamModule/Module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace BamModule;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/BarModule/Module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace BarModule;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/BazModule/Module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace BazModule;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/BooModule/Module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace BooModule;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/BorModule/Module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace BorModule;
Expand Down
6 changes: 0 additions & 6 deletions test/TestAsset/ListenerTestModule/Module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ListenerTestModule;
Expand All @@ -15,11 +14,6 @@
use Zend\ModuleManager\Feature\BootstrapListenerInterface;
use Zend\EventManager\EventInterface;

/**
* @category Zend
* @package Zend_ModuleManager
* @subpackage UnitTest
*/
class Module implements
AutoloaderProviderInterface,
LocatorRegisteredInterface,
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/ListenerTestModule/src/Foo/Bar.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace Foo;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/LoadOtherModule/Module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace LoadOtherModule;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/MockApplication.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace ZendTest\ModuleManager\TestAsset;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/NotAutoloaderModule/Module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace NotAutoloaderModule;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/NotAutoloaderModule/src/Foo/Bar.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace Foo;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/SomeModule/Module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace SomeModule;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/SubModule/Sub/Module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ModuleManager
*/

namespace SubModule\Sub;
Expand Down

0 comments on commit 1822787

Please sign in to comment.