diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 64f0cff..71f1c74 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -12,7 +12,7 @@
 
 /**
  * Invalid Argument Exception
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Exception
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index 1bef7b8..5ce5871 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -12,7 +12,7 @@
 
 /**
  * Runtime Exception
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Exception
diff --git a/src/Feature/ConfigProviderInterface.php b/src/Feature/ConfigProviderInterface.php
index 44f3725..811e8b3 100644
--- a/src/Feature/ConfigProviderInterface.php
+++ b/src/Feature/ConfigProviderInterface.php
@@ -19,7 +19,7 @@ interface ConfigProviderInterface
 {
     /**
      * Returns configuration to merge with application configuration
-     * 
+     *
      * @return array|\Traversable
      */
     public function getConfig();
diff --git a/src/Feature/LocatorRegisteredInterface.php b/src/Feature/LocatorRegisteredInterface.php
index 00e7550..ed1f3db 100644
--- a/src/Feature/LocatorRegisteredInterface.php
+++ b/src/Feature/LocatorRegisteredInterface.php
@@ -11,14 +11,14 @@
 namespace Zend\ModuleManager\Feature;
 
 /**
- * LocatorRegistered 
+ * LocatorRegistered
  *
- * By implementing this interface in a Module class, the instance of the Module 
- * class will be automatically injected into any DI-configured object which has 
- * a constructor or setter parameter which is type hinted with the Module class 
- * name. Implementing this interface obviously does not require adding any 
+ * By implementing this interface in a Module class, the instance of the Module
+ * class will be automatically injected into any DI-configured object which has
+ * a constructor or setter parameter which is type hinted with the Module class
+ * name. Implementing this interface obviously does not require adding any
  * methods to your class.
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Feature
diff --git a/src/Listener/AbstractListener.php b/src/Listener/AbstractListener.php
index 45553f0..dab3354 100644
--- a/src/Listener/AbstractListener.php
+++ b/src/Listener/AbstractListener.php
@@ -12,7 +12,7 @@
 
 /**
  * Abstract listener
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Listener
diff --git a/src/Listener/AutoloaderListener.php b/src/Listener/AutoloaderListener.php
index 67fad15..9286c37 100644
--- a/src/Listener/AutoloaderListener.php
+++ b/src/Listener/AutoloaderListener.php
@@ -16,7 +16,7 @@
 
 /**
  * Autoloader listener
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Listener
diff --git a/src/Listener/ConfigMergerInterface.php b/src/Listener/ConfigMergerInterface.php
index ec14619..2c1319b 100644
--- a/src/Listener/ConfigMergerInterface.php
+++ b/src/Listener/ConfigMergerInterface.php
@@ -12,7 +12,7 @@
 
 /**
  * Config merger interface
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Listener
diff --git a/src/Listener/Exception/ExceptionInterface.php b/src/Listener/Exception/ExceptionInterface.php
index 326ef78..4714b4b 100644
--- a/src/Listener/Exception/ExceptionInterface.php
+++ b/src/Listener/Exception/ExceptionInterface.php
@@ -14,7 +14,7 @@
 
 /**
  * Exception interface
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Listener
diff --git a/src/Listener/Exception/InvalidArgumentException.php b/src/Listener/Exception/InvalidArgumentException.php
index d3234de..c2991c7 100644
--- a/src/Listener/Exception/InvalidArgumentException.php
+++ b/src/Listener/Exception/InvalidArgumentException.php
@@ -14,7 +14,7 @@
 
 /**
  * Invalid Argument Exception
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Listener
diff --git a/src/Listener/Exception/RuntimeException.php b/src/Listener/Exception/RuntimeException.php
index bbc932e..344ade5 100644
--- a/src/Listener/Exception/RuntimeException.php
+++ b/src/Listener/Exception/RuntimeException.php
@@ -14,7 +14,7 @@
 
 /**
  * Runtime Exception
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Listener
diff --git a/src/Listener/InitTrigger.php b/src/Listener/InitTrigger.php
index 75f7ec9..36c15e0 100644
--- a/src/Listener/InitTrigger.php
+++ b/src/Listener/InitTrigger.php
@@ -15,7 +15,7 @@
 
 /**
  * Init trigger
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Listener
diff --git a/src/Listener/ModuleResolverListener.php b/src/Listener/ModuleResolverListener.php
index 5093f30..3a18625 100644
--- a/src/Listener/ModuleResolverListener.php
+++ b/src/Listener/ModuleResolverListener.php
@@ -12,7 +12,7 @@
 
 /**
  * Module resolver listener
- * 
+ *
  * @category   Zend
  * @package    Zend_ModuleManager
  * @subpackage Listener
diff --git a/test/ModuleManagerTest.php b/test/ModuleManagerTest.php
index fdec50d..408a889 100644
--- a/test/ModuleManagerTest.php
+++ b/test/ModuleManagerTest.php
@@ -38,7 +38,7 @@ public function setUp()
         $this->includePath = get_include_path();
 
         $this->defaultListeners = new DefaultListenerAggregate(
-            new ListenerOptions(array( 
+            new ListenerOptions(array(
                 'module_paths'         => array(
                     realpath(__DIR__ . '/TestAsset'),
                 ),
@@ -49,7 +49,7 @@ public function setUp()
     public function tearDown()
     {
         $file = glob($this->tmpdir . DIRECTORY_SEPARATOR . '*');
-        @unlink($file[0]); // change this if there's ever > 1 file 
+        @unlink($file[0]); // change this if there's ever > 1 file
         @rmdir($this->tmpdir);
         // Restore original autoloaders
         AutoloaderFactory::unregisterAutoloaders();
@@ -67,7 +67,7 @@ public function tearDown()
         // Restore original include_path
         set_include_path($this->includePath);
     }
-    
+
     public function testEventManagerIdentifiers()
     {
         $moduleManager = new ModuleManager(array());
diff --git a/test/TestAsset/BafModule/Module.php b/test/TestAsset/BafModule/Module.php
index c88bb87..b2ec531 100644
--- a/test/TestAsset/BafModule/Module.php
+++ b/test/TestAsset/BafModule/Module.php
@@ -15,7 +15,7 @@
 class Module
 {
 	protected $version = 1;
-	
+
     public function init()
     {
         $this->initAutoloader();
@@ -30,7 +30,7 @@ public function getConfig()
     {
         return new Config(include __DIR__ . '/configs/config.php');
     }
-    
+
 	public function getProvides()
     {
     	return array(
@@ -39,7 +39,7 @@ public function getProvides()
     		),
     	);
     }
-    
+
     public function getDependencies()
     {
     	return array(
diff --git a/test/TestAsset/BamModule/Module.php b/test/TestAsset/BamModule/Module.php
index 1e1723c..a83eb05 100644
--- a/test/TestAsset/BamModule/Module.php
+++ b/test/TestAsset/BamModule/Module.php
@@ -15,7 +15,7 @@
 class Module
 {
 	protected $version = 1;
-	
+
     public function init()
     {
         $this->initAutoloader();
@@ -30,7 +30,7 @@ public function getConfig()
     {
         return new Config(include __DIR__ . '/configs/config.php');
     }
-    
+
 	public function getProvides()
     {
     	return array(
@@ -39,7 +39,7 @@ public function getProvides()
     		),
     	);
     }
-    
+
     public function getDependencies()
     {
     	return array(
diff --git a/test/TestAsset/BarModule/Module.php b/test/TestAsset/BarModule/Module.php
index 09ef86d..95eba7c 100644
--- a/test/TestAsset/BarModule/Module.php
+++ b/test/TestAsset/BarModule/Module.php
@@ -15,7 +15,7 @@
 class Module
 {
 	protected $version = 1;
-	
+
     public function init()
     {
         $this->initAutoloader();
@@ -30,7 +30,7 @@ public function getConfig()
     {
         return new Config(include __DIR__ . '/configs/config.php');
     }
-    
+
 	public function getProvides()
     {
     	return array(
@@ -39,14 +39,14 @@ public function getProvides()
     		),
     	);
     }
-    
+
     public function getDependencies()
     {
     	return array(
 			'php' => array(
     			'version' => '5.3.0',
     			'required' => true,
-    		),  	
+    		),
     	);
     }
 }
diff --git a/test/TestAsset/BooModule/Module.php b/test/TestAsset/BooModule/Module.php
index 8bac701..c18f718 100644
--- a/test/TestAsset/BooModule/Module.php
+++ b/test/TestAsset/BooModule/Module.php
@@ -15,7 +15,7 @@
 class Module
 {
 	protected $version = 1;
-	
+
     public function init()
     {
         $this->initAutoloader();
@@ -30,7 +30,7 @@ public function getConfig()
     {
         return new Config(include __DIR__ . '/configs/config.php');
     }
-    
+
 	public function getProvides()
     {
     	return array(
@@ -39,7 +39,7 @@ public function getProvides()
     		),
     	);
     }
-    
+
     public function getDependencies()
     {
     	return array(
diff --git a/test/TestAsset/BorModule/Module.php b/test/TestAsset/BorModule/Module.php
index 6a62f7d..3c7cf90 100644
--- a/test/TestAsset/BorModule/Module.php
+++ b/test/TestAsset/BorModule/Module.php
@@ -15,7 +15,7 @@
 class Module
 {
 	protected $version = 1;
-	
+
     public function init()
     {
         $this->initAutoloader();
@@ -30,7 +30,7 @@ public function getConfig()
     {
         return new Config(include __DIR__ . '/configs/config.php');
     }
-    
+
 	public function getProvides()
     {
     	return array(
@@ -39,7 +39,7 @@ public function getProvides()
     		),
     	);
     }
-    
+
     public function getDependencies()
     {
     	return array(
diff --git a/test/TestAsset/DoubleModule/Module.php b/test/TestAsset/DoubleModule/Module.php
index 065f109..64fc6a3 100644
--- a/test/TestAsset/DoubleModule/Module.php
+++ b/test/TestAsset/DoubleModule/Module.php
@@ -15,7 +15,7 @@
 class Module
 {
 	protected $version = 1;
-	
+
     public function init()
     {
         $this->initAutoloader();
@@ -30,7 +30,7 @@ public function getConfig()
     {
         return new Config(include __DIR__ . '/configs/config.php');
     }
-    
+
 	public function getProvides()
     {
     	return array(
@@ -39,13 +39,13 @@ public function getProvides()
     		),
     	);
     }
-    
+
     public function getDependencies()
     {
     	return array(
 			'php' => array(
     			'version' => '5.3.0',
-    		)   	
+    		)
     	);
     }
 }
diff --git a/test/TestAsset/ImpossibleModule/Module.php b/test/TestAsset/ImpossibleModule/Module.php
index dccf63b..9a4d9b1 100644
--- a/test/TestAsset/ImpossibleModule/Module.php
+++ b/test/TestAsset/ImpossibleModule/Module.php
@@ -15,7 +15,7 @@
 class Module
 {
 	protected $version = 1;
-	
+
     public function init()
     {
         $this->initAutoloader();
@@ -30,7 +30,7 @@ public function getConfig()
     {
         return new Config(include __DIR__ . '/configs/config.php');
     }
-    
+
 	public function getProvides()
     {
     	return array(
@@ -39,14 +39,14 @@ public function getProvides()
     		),
     	);
     }
-    
+
     public function getDependencies()
     {
     	return array(
 			'php' => array(
     			'version' => '99.3.0',
     		),
-    		'BarModule' => true, 	
+    		'BarModule' => true,
     	);
     }
 }