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

Commit

Permalink
Merge pull request zendframework/zendframework#5714 in develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maks3w
Maks3w committed Feb 19, 2014
154 parents 883b5fd + 4f3d0a9 + c2e87c3 + 62f83fa + cec8933 + 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 + 1c9aa26 + 7abe866 + dfe045d + 1b4822b + ae1f9f3 + 986e6d4 + 6424a7a + 9fb11da + 27c896d + 350b8cf + 6bab62b + 1822787 + 0b5ec15 + 5d9a0d7 + 5560ba8 commit 2bd3583
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 14 deletions.
5 changes: 3 additions & 2 deletions test/Listener/AutoloaderListenerTest.php
View file
Expand Up @@ -15,6 +15,7 @@
use Zend\ModuleManager\Listener\AutoloaderListener;
use Zend\ModuleManager\Listener\ModuleResolverListener;
use Zend\ModuleManager\ModuleManager;
use Zend\ModuleManager\ModuleEvent;

class AutoloaderListenerTest extends TestCase
{
Expand All @@ -37,8 +38,8 @@ public function setUp()
$autoloader->register();

$this->moduleManager = new ModuleManager(array());
$this->moduleManager->getEventManager()->attach('loadModule.resolve', new ModuleResolverListener, 1000);
$this->moduleManager->getEventManager()->attach('loadModule', new AutoloaderListener, 2000);
$this->moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE_RESOLVE, new ModuleResolverListener, 1000);
$this->moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE, new AutoloaderListener, 2000);
}

public function tearDown()
Expand Down
9 changes: 5 additions & 4 deletions test/Listener/ConfigListenerTest.php
View file
Expand Up @@ -18,6 +18,7 @@
use Zend\ModuleManager\Listener\ModuleResolverListener;
use Zend\ModuleManager\Listener\ListenerOptions;
use Zend\ModuleManager\ModuleManager;
use Zend\ModuleManager\ModuleEvent;

class ConfigListenerTest extends TestCase
{
Expand All @@ -43,7 +44,7 @@ public function setUp()
$autoloader->register();

$this->moduleManager = new ModuleManager(array());
$this->moduleManager->getEventManager()->attach('loadModule.resolve', new ModuleResolverListener, 1000);
$this->moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE_RESOLVE, new ModuleResolverListener, 1000);
}

public function tearDown()
Expand Down Expand Up @@ -104,7 +105,7 @@ public function testCanCacheMergedConfig()
// Now we check to make sure it uses the config and doesn't hit
// the module objects getConfig() method(s)
$moduleManager = new ModuleManager(array('SomeModule', 'ListenerTestModule'));
$moduleManager->getEventManager()->attach('loadModule.resolve', new ModuleResolverListener, 1000);
$moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE_RESOLVE, new ModuleResolverListener, 1000);
$configListener = new ConfigListener($options);
$configListener->attach($moduleManager->getEventManager());
$moduleManager->loadModules();
Expand Down Expand Up @@ -249,7 +250,7 @@ public function testCanCacheMergedConfigFromGlob()
// This time, don't add the glob path
$configListener = new ConfigListener($options);
$moduleManager = new ModuleManager(array('SomeModule'));
$moduleManager->getEventManager()->attach('loadModule.resolve', new ModuleResolverListener, 1000);
$moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE_RESOLVE, new ModuleResolverListener, 1000);

$moduleManager->getEventManager()->attachAggregate($configListener);

Expand Down Expand Up @@ -289,7 +290,7 @@ public function testCanCacheMergedConfigFromStatic()
// This time, don't add the glob path
$configListener = new ConfigListener($options);
$moduleManager = new ModuleManager(array('SomeModule'));
$moduleManager->getEventManager()->attach('loadModule.resolve', new ModuleResolverListener, 1000);
$moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE_RESOLVE, new ModuleResolverListener, 1000);

$moduleManager->getEventManager()->attachAggregate($configListener);

Expand Down
5 changes: 3 additions & 2 deletions test/Listener/InitTriggerTest.php
View file
Expand Up @@ -15,6 +15,7 @@
use Zend\ModuleManager\Listener\InitTrigger;
use Zend\ModuleManager\Listener\ModuleResolverListener;
use Zend\ModuleManager\ModuleManager;
use Zend\ModuleManager\ModuleEvent;

class InitTriggerTest extends TestCase
{
Expand All @@ -37,8 +38,8 @@ public function setUp()
$autoloader->register();

$this->moduleManager = new ModuleManager(array());
$this->moduleManager->getEventManager()->attach('loadModule.resolve', new ModuleResolverListener, 1000);
$this->moduleManager->getEventManager()->attach('loadModule', new InitTrigger, 2000);
$this->moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE_RESOLVE, new ModuleResolverListener, 1000);
$this->moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE, new InitTrigger, 2000);
}

public function tearDown()
Expand Down
5 changes: 3 additions & 2 deletions test/Listener/LocatorRegistrationListenerTest.php
View file
Expand Up @@ -17,6 +17,7 @@
use Zend\ModuleManager\Listener\LocatorRegistrationListener;
use Zend\ModuleManager\Listener\ModuleResolverListener;
use Zend\ModuleManager\ModuleManager;
use Zend\ModuleManager\ModuleEvent;
use Zend\Mvc\Application;
use Zend\ServiceManager\ServiceManager;
use ZendTest\ModuleManager\TestAsset\MockApplication;
Expand Down Expand Up @@ -49,7 +50,7 @@ public function setUp()

$this->moduleManager = new ModuleManager(array('ListenerTestModule'));
$this->moduleManager->getEventManager()->setSharedManager($this->sharedEvents);
$this->moduleManager->getEventManager()->attach('loadModule.resolve', new ModuleResolverListener, 1000);
$this->moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE_RESOLVE, new ModuleResolverListener, 1000);

$this->application = new MockApplication;
$events = new EventManager(array('Zend\Mvc\Application', 'ZendTest\Module\TestAsset\MockApplication', 'application'));
Expand Down Expand Up @@ -93,7 +94,7 @@ public function testModuleClassIsRegisteredWithDiAndInjectedWithSharedInstances(
$locatorRegistrationListener = new LocatorRegistrationListener;
$this->moduleManager->getEventManager()->attachAggregate($locatorRegistrationListener);
$test = $this;
$this->moduleManager->getEventManager()->attach('loadModule', function ($e) use ($test) {
$this->moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE, function ($e) use ($test) {
$test->module = $e->getModule();
}, -1000);
$this->moduleManager->loadModules();
Expand Down
3 changes: 2 additions & 1 deletion test/Listener/ModuleDependencyCheckerListenerTest.php
View file
Expand Up @@ -12,6 +12,7 @@
use PHPUnit_Framework_TestCase as TestCase;
use Zend\ModuleManager\Listener\ModuleDependencyCheckerListener;
use Zend\ModuleManager\ModuleManager;
use Zend\ModuleManager\ModuleEvent;

class ModuleDependencyCheckerListenerTest extends TestCase
{
Expand All @@ -21,7 +22,7 @@ class ModuleDependencyCheckerListenerTest extends TestCase
public function testCallsGetModuleDependenciesOnModuleImplementingInterface()
{
//$moduleManager = new ModuleManager(array());
//$moduleManager->getEventManager()->attach('loadModule', new ModuleDependencyCheckerListener(), 2000);
//$moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE, new ModuleDependencyCheckerListener(), 2000);

$module = $this->getMock('Zend\ModuleManager\Feature\DependencyIndicatorInterface');
$module->expects($this->once())->method('getModuleDependencies')->will($this->returnValue(array()));
Expand Down
2 changes: 1 addition & 1 deletion test/Listener/ModuleLoaderListenerTest.php
View file
Expand Up @@ -24,7 +24,7 @@ public function setUp()
@mkdir($this->tmpdir);

$this->moduleManager = new ModuleManager(array());
$this->moduleManager->getEventManager()->attach('loadModule.resolve', new ModuleResolverListener, 1000);
$this->moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE_RESOLVE, new ModuleResolverListener, 1000);
}

public function tearDown()
Expand Down
5 changes: 3 additions & 2 deletions test/Listener/OnBootstrapListenerTest.php
View file
Expand Up @@ -17,6 +17,7 @@
use Zend\ModuleManager\Listener\ModuleResolverListener;
use Zend\ModuleManager\Listener\OnBootstrapListener;
use Zend\ModuleManager\ModuleManager;
use Zend\ModuleManager\ModuleEvent;
use Zend\Mvc\Application;
use ZendTest\ModuleManager\TestAsset\MockApplication;

Expand All @@ -43,8 +44,8 @@ public function setUp()
$sharedEvents = new SharedEventManager();
$this->moduleManager = new ModuleManager(array());
$this->moduleManager->getEventManager()->setSharedManager($sharedEvents);
$this->moduleManager->getEventManager()->attach('loadModule.resolve', new ModuleResolverListener, 1000);
$this->moduleManager->getEventManager()->attach('loadModule', new OnBootstrapListener, 1000);
$this->moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE_RESOLVE, new ModuleResolverListener, 1000);
$this->moduleManager->getEventManager()->attach(ModuleEvent::EVENT_LOAD_MODULE, new OnBootstrapListener, 1000);

$this->application = new MockApplication;
$events = new EventManager(array('Zend\Mvc\Application', 'ZendTest\Module\TestAsset\MockApplication', 'application'));
Expand Down

0 comments on commit 2bd3583

Please sign in to comment.