Merge pull request #4 from sinbonders/master

Changing event to listen to EVENT_LOAD_MODULE

src/ZendPhpDotEnv/Module.php

@@ -44,7 +44,7 @@ public function init(ModuleManager $moduleManager)
     {
         $events = $moduleManager->getEventManager();
 
-        $events->attach(ModuleEvent::EVENT_MERGE_CONFIG, array($this, 'loadEnvironmentVariables'), 2000);
+        $events->attach(ModuleEvent::EVENT_LOAD_MODULE, array($this, 'loadEnvironmentVariables'), -1);
     }
 
     /**

tests/ZendPhpDotEnv/ModuleTest.php

@@ -5,6 +5,7 @@
 use Abacaphiliac\ZendPhpDotEnv\DotEnvLoader;
 use Abacaphiliac\ZendPhpDotEnv\Module;
 use Zend\EventManager\SharedEventManager;
+use Zend\ModuleManager\ModuleEvent;
 use Zend\Mvc\Service\EventManagerFactory;
 use Zend\Mvc\Service\ModuleManagerFactory;
 use Zend\ServiceManager\ServiceManager;
@@ -45,9 +46,9 @@ public function testModuleLoadsEnvironmentVariablesFromWorkingDirectory()
     }
 
     /**
-     * @expectedException \Dotenv\Exception\InvalidPathException
+     * @expectedException \Abacaphiliac\ZendPhpDotEnv\Exception\InvalidWorkingDirectoryPathException
      */
-    public function testLoadModule()
+    public function testInitLoadsEnvironmentVariablesFromWorkingDirectory()
     {
         $serviceLocator = new ServiceManager();
         $serviceLocator->setService('ApplicationConfig', array(
@@ -59,10 +60,14 @@ public function testLoadModule()
         $serviceLocator->setFactory('EventManager', new EventManagerFactory());
         $serviceLocator->setService('SharedEventManager', new SharedEventManager());
         $serviceLocator->setFactory('ServiceListener', '\Zend\Mvc\Service\ServiceListenerFactory');
-        
+
         $moduleManagerFactory = new ModuleManagerFactory();
         $moduleManager = $moduleManagerFactory->createService($serviceLocator);
-
-        $moduleManager->loadModules();
+
+        $module = new Module($constant = null, $variable = null, $file = '.testEnv');
+
+        $module->init($moduleManager);
+
+        $moduleManager->getEventManager()->trigger(new ModuleEvent(ModuleEvent::EVENT_LOAD_MODULE));
     }
 }