diff --git a/src/Configuration.php b/src/Configuration.php
index b788c3b0..520aca30 100644
--- a/src/Configuration.php
+++ b/src/Configuration.php
@@ -19,7 +19,7 @@ class Configuration
      * @var array
      */
     protected $data = array();
-    
+
     /**
      * Constructor
      *
@@ -55,7 +55,7 @@ public function configure(Di $di)
         if (isset($this->data['instance'])) {
             $this->configureInstance($di, $this->data['instance']);
         }
-        
+
     }
 
     public function configureDefinition(Di $di, $definition)
@@ -136,11 +136,11 @@ public function configureDefinition(Di $di, $definition)
         }
 
     }
-    
+
     public function configureInstance(Di $di, $instanceData)
     {
         $im = $di->instanceManager();
-        
+
         foreach ($instanceData as $target => $data) {
             switch (strtolower($target)) {
                 case 'aliases':
@@ -183,5 +183,5 @@ public function configureInstance(Di $di, $instanceData)
 
     }
 
-    
+
 }
diff --git a/src/Definition/ArrayDefinition.php b/src/Definition/ArrayDefinition.php
index 3f3c8bae..cf0a7067 100644
--- a/src/Definition/ArrayDefinition.php
+++ b/src/Definition/ArrayDefinition.php
@@ -12,9 +12,9 @@
 
 class ArrayDefinition implements DefinitionInterface
 {
-    
+
     protected $dataArray = array();
-    
+
     public function __construct(Array $dataArray)
     {
         foreach ($dataArray as $class => $value) {
@@ -23,79 +23,79 @@ public function __construct(Array $dataArray)
         }
         $this->dataArray = $dataArray;
     }
-    
+
     public function getClasses()
     {
         return array_keys($this->dataArray);
     }
-    
+
     public function hasClass($class)
     {
         return array_key_exists($class, $this->dataArray);
     }
-    
+
     public function getClassSupertypes($class)
     {
         if (!isset($this->dataArray[$class])) {
             return array();
         }
-        
+
         if (!isset($this->dataArray[$class]['supertypes'])) {
             return array();
         }
-        
+
         return $this->dataArray[$class]['supertypes'];
     }
-    
+
     public function getInstantiator($class)
     {
         if (!isset($this->dataArray[$class])) {
             return null;
         }
-        
+
         if (!isset($this->dataArray[$class]['instantiator'])) {
             return '__construct';
         }
-        
+
         return $this->dataArray[$class]['instantiator'];
     }
-    
+
     public function hasMethods($class)
     {
         if (!isset($this->dataArray[$class])) {
             return array();
         }
-        
+
         if (!isset($this->dataArray[$class]['methods'])) {
             return array();
         }
-        
+
         return (count($this->dataArray[$class]['methods']) > 0);
     }
-    
+
     public function hasMethod($class, $method)
     {
         if (!isset($this->dataArray[$class])) {
             return false;
         }
-        
+
         if (!isset($this->dataArray[$class]['methods'])) {
             return false;
         }
-        
+
         return array_key_exists($method, $this->dataArray[$class]['methods']);
     }
-    
+
     public function getMethods($class)
     {
         if (!isset($this->dataArray[$class])) {
             return array();
         }
-        
+
         if (!isset($this->dataArray[$class]['methods'])) {
             return array();
         }
-        
+
         return $this->dataArray[$class]['methods'];
     }
 
@@ -114,18 +114,18 @@ public function getMethodParameters($class, $method)
         if (!isset($this->dataArray[$class])) {
             return array();
         }
-        
+
         if (!isset($this->dataArray[$class]['parameters'])) {
             return array();
         }
-        
+
         if (!isset($this->dataArray[$class]['parameters'][$method])) {
             return array();
         }
-        
+
         return $this->dataArray[$class]['parameters'][$method];
     }
-    
+
     public function toArray()
     {
         return $this->dataArray;
diff --git a/src/Definition/Builder/InjectionMethod.php b/src/Definition/Builder/InjectionMethod.php
index c8525175..7643fcde 100644
--- a/src/Definition/Builder/InjectionMethod.php
+++ b/src/Definition/Builder/InjectionMethod.php
@@ -13,21 +13,21 @@
 class InjectionMethod
 {
     const PARAMETER_POSTION_NEXT = 'next';
-    
+
     protected $name = null;
     protected $parameters = array();
-    
+
     public function setName($name)
     {
         $this->name = $name;
         return $this;
     }
-    
+
     public function getName()
     {
         return $this->name;
     }
-    
+
     public function addParameter($name, $class = null, $isRequired = null)
     {
         $this->parameters[] = array(
@@ -37,10 +37,10 @@ public function addParameter($name, $class = null, $isRequired = null)
         );
         return $this;
     }
-    
+
     public function getParameters()
     {
         return $this->parameters;
     }
-    
+
 }
diff --git a/src/Definition/Builder/PhpClass.php b/src/Definition/Builder/PhpClass.php
index f8ea9f8c..117b1ac2 100644
--- a/src/Definition/Builder/PhpClass.php
+++ b/src/Definition/Builder/PhpClass.php
@@ -39,13 +39,13 @@ public function getName()
     {
         return $this->name;
     }
-    
+
     public function setInstantiator($instantiator)
     {
         $this->instantiator = $instantiator;
         return $this;
     }
-    
+
     public function getInstantiator()
     {
         return $this->instantiator;
@@ -84,11 +84,11 @@ public function addInjectionMethod(InjectionMethod $injectionMethod)
      *
      * Optionally takes the method name.
      *
-     * This method may be used in lieu of addInjectionMethod() in 
+     * This method may be used in lieu of addInjectionMethod() in
      * order to provide a more fluent interface for building classes with
      * injection methods.
-     * 
-     * @param  null|string $name 
+     *
+     * @param  null|string $name
      * @return InjectionMethod
      */
     public function createInjectionMethod($name = null)
@@ -104,8 +104,8 @@ public function createInjectionMethod($name = null)
 
     /**
      * Override which class will be used by {@link createInjectionMethod()}
-     * 
-     * @param  string $class 
+     *
+     * @param  string $class
      * @return PhpClass
      */
     public function setMethodBuilder($class)
@@ -118,14 +118,14 @@ public function setMethodBuilder($class)
      * Determine what class will be used by {@link createInjectionMethod()}
      *
      * Mainly to provide the ability to temporarily override the class used.
-     * 
+     *
      * @return string
      */
     public function getMethodBuilder()
     {
         return $this->defaultMethodBuilder;
     }
-    
+
     public function getInjectionMethods()
     {
         return $this->injectionMethods;
diff --git a/src/Definition/BuilderDefinition.php b/src/Definition/BuilderDefinition.php
index a1b6c076..a5ac9a04 100644
--- a/src/Definition/BuilderDefinition.php
+++ b/src/Definition/BuilderDefinition.php
@@ -57,7 +57,7 @@ public function createClassesFromArray(array $builderData)
                             $class->addInjectionMethod($injectionMethod);
                         }
                         break;
-                    
+
                 }
             }
             $this->addClass($class);
@@ -80,7 +80,7 @@ public function addClass(Builder\PhpClass $phpClass)
      * Create a class builder object using default class builder class
      *
      * This method is a factory that can be used in place of addClass().
-     * 
+     *
      * @param  null|string $name Optional name of class to assign
      * @return Builder\PhpClass
      */
@@ -98,8 +98,8 @@ public function createClass($name = null)
 
     /**
      * Set the class to use with {@link createClass()}
-     * 
-     * @param  string $class 
+     *
+     * @param  string $class
      * @return BuilderDefinition
      */
     public function setClassBuilder($class)
@@ -111,9 +111,9 @@ public function setClassBuilder($class)
     /**
      * Get the class used for {@link createClass()}
      *
-     * This is primarily to allow developers to temporarily override 
+     * This is primarily to allow developers to temporarily override
      * the builder strategy.
-     * 
+     *
      * @return string
      */
     public function getClassBuilder()
diff --git a/src/Definition/ClassDefinition.php b/src/Definition/ClassDefinition.php
index 498edea9..7126d357 100644
--- a/src/Definition/ClassDefinition.php
+++ b/src/Definition/ClassDefinition.php
@@ -75,7 +75,7 @@ public function addMethodParameter($method, $parameterName, array $parameterInfo
         $this->methodParameters[$method][$fqName] = array(
             $parameterName, $type, $required
         );
-        
+
         return $this;
     }
 
diff --git a/src/DefinitionList.php b/src/DefinitionList.php
index a5a5b389..692fb46a 100644
--- a/src/DefinitionList.php
+++ b/src/DefinitionList.php
@@ -119,7 +119,7 @@ public function hasClass($class)
         }
         return false;
     }
-    
+
     public function getClassSupertypes($class)
     {
         $supertypes = array();
@@ -130,7 +130,7 @@ public function getClassSupertypes($class)
         // @todo remove duplicates?
         return $supertypes;
     }
-    
+
     public function getInstantiator($class)
     {
         /** @var $definition Definition\DefinitionInterface */
@@ -228,5 +228,5 @@ public function getMethodParameters($class, $method)
         }
         return array();
     }
-    
+
 }
diff --git a/src/DependencyInjectionInterface.php b/src/DependencyInjectionInterface.php
index f2820305..fcce4655 100644
--- a/src/DependencyInjectionInterface.php
+++ b/src/DependencyInjectionInterface.php
@@ -17,7 +17,7 @@ interface DependencyInjectionInterface extends LocatorInterface
      *
      * Forces retrieval of a discrete instance of the given class, using the
      * constructor parameters provided.
-     * 
+     *
      * @param  mixed $name Class name or service alias
      * @param  array $params Parameters to pass to the constructor
      * @return object|null
diff --git a/src/Display/Console.php b/src/Display/Console.php
index 8426b551..4f3bd1a1 100644
--- a/src/Display/Console.php
+++ b/src/Display/Console.php
@@ -108,7 +108,7 @@ public function render()
         }
 
         echo PHP_EOL . '  Configurations:' . PHP_EOL;
-        
+
         foreach ($configuredTypes as $type) {
             $info = $this->di->instanceManager()->getConfiguration($type);
             echo '    ' . $type . PHP_EOL;
diff --git a/src/InstanceManager.php b/src/InstanceManager.php
index b23b8da9..25be8ec8 100644
--- a/src/InstanceManager.php
+++ b/src/InstanceManager.php
@@ -23,19 +23,19 @@ class InstanceManager /* implements InstanceManagerInterface */
      * @var array
      */
     protected $sharedInstancesWithParams = array('hashShort' => array(), 'hashLong' => array());
-    
+
     /**
      * Array of class aliases
      * @var array key: alias, value: class
      */
     protected $aliases = array();
-    
+
     /**
      * The template to use for housing configuration information
-     * @var array 
+     * @var array
      */
     protected $configurationTemplate = array(
-        /** 
+        /**
          * alias|class => alias|class
          * interface|abstract => alias|class|object
          * name => value
@@ -56,13 +56,13 @@ class InstanceManager /* implements InstanceManagerInterface */
      * @var array
      */
     protected $configurations = array();
-    
+
     /**
      * An array of globally preferred implementations for interfaces/abstracts
      * @var array
      */
     protected $typePreferences = array();
-    
+
     /**
      * Does this instance manager have this shared instance
      * @return bool
@@ -71,7 +71,7 @@ public function hasSharedInstance($classOrAlias)
     {
         return isset($this->sharedInstances[$classOrAlias]);
     }
-    
+
     /**
      * getSharedInstance()
      */
@@ -130,8 +130,8 @@ public function addSharedInstanceWithParameters($instance, $classOrAlias, array
         ksort($params);
         $hashKey = $this->createHashForKeys($classOrAlias, array_keys($params));
         $hashValue = $this->createHashForValues($classOrAlias, $params);
-        
-        if (!isset($this->sharedInstancesWithParams[$hashKey]) 
+
+        if (!isset($this->sharedInstancesWithParams[$hashKey])
             || !is_array($this->sharedInstancesWithParams[$hashKey])) {
             $this->sharedInstancesWithParams[$hashKey] = array();
         }
@@ -139,13 +139,13 @@ public function addSharedInstanceWithParameters($instance, $classOrAlias, array
         $this->sharedInstancesWithParams['hashShort'][$hashKey] = true;
         $this->sharedInstancesWithParams['hashLong'][$hashKey . '/' . $hashValue] = $instance;
     }
-    
+
     public function getSharedInstanceWithParameters($classOrAlias, array $params, $fastHashFromHasLookup = null)
     {
         if ($fastHashFromHasLookup) {
             return $this->sharedInstancesWithParams['hashLong'][$fastHashFromHasLookup];
         }
-        
+
         ksort($params);
         $hashKey = $this->createHashForKeys($classOrAlias, array_keys($params));
         if (isset($this->sharedInstancesWithParams['hashShort'][$hashKey])) {
@@ -177,7 +177,7 @@ public function getAliases()
     {
         return $this->aliases;
     }
-    
+
     /**
      * getClassFromAlias()
      *
@@ -202,7 +202,7 @@ public function getClassFromAlias($alias)
         }
         return $alias;
     }
-    
+
     protected function getBaseAlias($alias)
     {
         if (!$this->hasAlias($alias)) {
@@ -217,12 +217,12 @@ protected function getBaseAlias($alias)
             if ($r > 100) {
                 throw new Exception\RuntimeException(
                     sprintf('Possible infinite recursion in DI alias! Max recursion of 100 levels reached at alias "%s".', $alias)
-                ); 
+                );
             }
         }
         return $lastAlias;
     }
-    
+
     /**
      * Add alias
      *
@@ -262,7 +262,7 @@ public function hasConfiguration($aliasOrClass)
         }
         return true;
     }
-    
+
     public function setConfiguration($aliasOrClass, array $configuration, $append = false)
     {
         $key = ($this->hasAlias($aliasOrClass)) ? 'alias:' . $this->getBaseAlias($aliasOrClass) : $aliasOrClass;
@@ -297,16 +297,16 @@ public function getConfiguration($aliasOrClass)
     {
         $key = ($this->hasAlias($aliasOrClass)) ? 'alias:' . $this->getBaseAlias($aliasOrClass) : $aliasOrClass;
         if (isset($this->configurations[$key])) {
-            return $this->configurations[$key];            
+            return $this->configurations[$key];
         } else {
             return $this->configurationTemplate;
         }
     }
-    
+
     /**
      * setParameters() is a convenience method for:
      *    setConfiguration($type, array('parameters' => array(...)), true);
-     *     
+     *
      * @param string $type Alias or Class
      * @param array $parameters Multi-dim array of parameters and their values
      * @return void
@@ -315,11 +315,11 @@ public function setParameters($aliasOrClass, array $parameters)
     {
         $this->setConfiguration($aliasOrClass, array('parameters' => $parameters), true);
     }
-    
+
     /**
      * setInjections() is a convenience method for:
      *    setConfiguration($type, array('injections' => array(...)), true);
-     *     
+     *
      * @param string $type Alias or Class
      * @param array $methods Multi-dim array of methods and their parameters
      * @return void
@@ -421,7 +421,7 @@ protected function createHashForKeys($classOrAlias, $paramKeys)
     {
         return $classOrAlias . ':' . implode('|', $paramKeys);
     }
-    
+
     protected function createHashForValues($classOrAlias, $paramValues)
     {
         $hashValue = '';
diff --git a/src/LocatorInterface.php b/src/LocatorInterface.php
index de8b1742..42742eed 100644
--- a/src/LocatorInterface.php
+++ b/src/LocatorInterface.php
@@ -14,7 +14,7 @@ interface LocatorInterface
 {
     /**
      * Retrieve a class instance
-     * 
+     *
      * @param  string $name Class name or service name
      * @param  null|array $params Parameters to be used when instantiating a new instance of $name
      * @return object|null
diff --git a/src/ServiceLocator.php b/src/ServiceLocator.php
index 3f33b5ac..1ebd73ff 100644
--- a/src/ServiceLocator.php
+++ b/src/ServiceLocator.php
@@ -17,7 +17,7 @@ class ServiceLocator implements ServiceLocatorInterface
     /**
      * Map of service names to methods
      *
-     * As an example, you might define a getter method "getFoo", and map it to 
+     * As an example, you might define a getter method "getFoo", and map it to
      * the service name "foo":
      *
      * <code>
@@ -26,25 +26,25 @@ class ServiceLocator implements ServiceLocatorInterface
      *
      * When encountered, the return value of that method will be used.
      *
-     * Methods mapped in this way may expect a single, array argument, the 
+     * Methods mapped in this way may expect a single, array argument, the
      * $params passed to {@link get()}, if any.
-     * 
+     *
      * @var array
      */
     protected $map = array();
 
     /**
      * Registered services and cached values
-     * 
+     *
      * @var array
      */
     protected $services = array();
 
     /**
      * Register a service with the locator
-     * 
-     * @param  string $name 
-     * @param  mixed $service 
+     *
+     * @param  string $name
+     * @param  mixed $service
      * @return ServiceLocator
      */
     public function set($name, $service)
@@ -56,19 +56,19 @@ public function set($name, $service)
     /**
      * Retrieve a registered service
      *
-     * Tests first if a value is registered for the service, and, if so, 
+     * Tests first if a value is registered for the service, and, if so,
      * returns it.
      *
      * If the value returned is a non-object callback or closure, the return
-     * value is retrieved, stored, and returned. Parameters passed to the method 
+     * value is retrieved, stored, and returned. Parameters passed to the method
      * are passed to the callback, but only on the first retrieval.
      *
      * If the service requested matches a method in the method map, the return
      * value of that method is returned. Parameters are passed to the matching
      * method.
-     * 
-     * @param  string $name 
-     * @param  array $params 
+     *
+     * @param  string $name
+     * @param  array $params
      * @return mixed
      */
     public function get($name, array $params = array())
diff --git a/test/ConfigurationTest.php b/test/ConfigurationTest.php
index 1d1ce5cd..b0f136fe 100644
--- a/test/ConfigurationTest.php
+++ b/test/ConfigurationTest.php
@@ -25,31 +25,31 @@ public function testConfigurationCanConfigureInstanceManagerWithIniFile()
         $di->configure($config);
 
         $im = $di->instanceManager();
-        
+
         $this->assertTrue($im->hasAlias('my-repository'));
         $this->assertEquals('My\RepositoryA', $im->getClassFromAlias('my-repository'));
-        
+
         $this->assertTrue($im->hasAlias('my-mapper'));
         $this->assertEquals('My\Mapper', $im->getClassFromAlias('my-mapper'));
-        
+
         $this->assertTrue($im->hasAlias('my-dbAdapter'));
         $this->assertEquals('My\DbAdapter', $im->getClassFromAlias('my-dbAdapter'));
-        
+
         $this->assertTrue($im->hasTypePreferences('my-repository'));
         $this->assertContains('my-mapper', $im->getTypePreferences('my-repository'));
-        
+
         $this->assertTrue($im->hasTypePreferences('my-mapper'));
         $this->assertContains('my-dbAdapter', $im->getTypePreferences('my-mapper'));
 
         $this->assertTrue($im->hasConfiguration('My\DbAdapter'));
         $expected = array('parameters' => array('username' => 'readonly', 'password' => 'mypassword'), 'injections' => array(), 'shared' => true);
         $this->assertEquals($expected, $im->getConfiguration('My\DbAdapter'));
-        
+
         $this->assertTrue($im->hasConfiguration('my-dbAdapter'));
         $expected = array('parameters' => array('username' => 'readwrite'), 'injections' => array(), 'shared' => true);
         $this->assertEquals($expected, $im->getConfiguration('my-dbAdapter'));
     }
-    
+
     public function testConfigurationCanConfigureBuilderDefinitionFromIni()
     {
         $this->markTestIncomplete('Builder not updated to new DI yet');
@@ -57,28 +57,28 @@ public function testConfigurationCanConfigureBuilderDefinitionFromIni()
         $config = new Configuration($ini->di);
         $di = new Di($config);
         $definition = $di->getDefinition();
-        
+
         $this->assertTrue($definition->hasClass('My\DbAdapter'));
         $this->assertEquals('__construct', $definition->getInstantiator('My\DbAdapter'));
         $this->assertEquals(
             array('username' => null, 'password' => null),
             $definition->getInjectionMethodParameters('My\DbAdapter', '__construct')
             );
-        
+
         $this->assertTrue($definition->hasClass('My\Mapper'));
         $this->assertEquals('__construct', $definition->getInstantiator('My\Mapper'));
         $this->assertEquals(
             array('dbAdapter' => 'My\DbAdapter'),
             $definition->getInjectionMethodParameters('My\Mapper', '__construct')
             );
-        
+
         $this->assertTrue($definition->hasClass('My\Repository'));
         $this->assertEquals('__construct', $definition->getInstantiator('My\Repository'));
         $this->assertEquals(
             array('mapper' => 'My\Mapper'),
             $definition->getInjectionMethodParameters('My\Repository', '__construct')
             );
-        
+
     }
 
     public function testConfigurationCanConfigureRuntimeDefinitionDefaultFromIni()
diff --git a/test/Definition/ArrayDefinitionTest.php b/test/Definition/ArrayDefinitionTest.php
index 3e32bc43..be5528d2 100644
--- a/test/Definition/ArrayDefinitionTest.php
+++ b/test/Definition/ArrayDefinitionTest.php
@@ -15,17 +15,17 @@
 
 class ArrayDefinitionTest extends TestCase
 {
-    
+
     /**
      * @var ArrayDefinition
      */
     protected $definition = null;
-    
+
     public function setup()
     {
         $this->definition = new ArrayDefinition(include __DIR__ . '/../_files/definition-array.php');
     }
-    
+
     public function testArrayDefinitionHasClasses()
     {
         $this->assertTrue($this->definition->hasClass('My\DbAdapter'));
@@ -35,7 +35,7 @@ public function testArrayDefinitionHasClasses()
         $this->assertTrue($this->definition->hasClass('My\RepositoryB'));
         $this->assertFalse($this->definition->hasClass('My\Foo'));
     }
-    
+
     public function testArrayDefinitionCanGetClassses()
     {
         $list = array(
@@ -45,38 +45,38 @@ public function testArrayDefinitionCanGetClassses()
             'My\RepositoryA',
             'My\RepositoryB'
         );
-        
+
         $classes = $this->definition->getClasses();
-        
+
         foreach ($list as $class) {
             $this->assertContains($class, $classes);
         }
-        
+
     }
-    
+
     public function testArrayDefinitionCanGetClassSupertypes()
     {
         $this->assertEquals(array(), $this->definition->getClassSupertypes('My\EntityA'));
         $this->assertContains('My\RepositoryA', $this->definition->getClassSupertypes('My\RepositoryB'));
     }
-    
-    
+
+
     public function testArrayDefinitionCanGetInstantiator()
     {
         $this->assertEquals('__construct', $this->definition->getInstantiator('My\RepositoryA'));
         $this->assertNull($this->definition->getInstantiator('My\Foo'));
     }
-    
+
     public function testArrayDefinitionHasInjectionMethods()
     {
         $this->markTestIncomplete();
     }
-    
+
     public function testArrayDefinitionHasInjectionMethod()
     {
         $this->markTestIncomplete();
     }
-    
+
     public function testArrayDefinitionGetInjectionMethods()
     {
         $this->markTestIncomplete();
@@ -87,6 +87,6 @@ public function testArrayDefinitionGetInjectionMethodParameters()
         $this->markTestIncomplete();
     }
 
-    
-    
+
+
 }
diff --git a/test/Definition/BuilderDefinitionTest.php b/test/Definition/BuilderDefinitionTest.php
index afed0866..45acce5f 100644
--- a/test/Definition/BuilderDefinitionTest.php
+++ b/test/Definition/BuilderDefinitionTest.php
@@ -17,28 +17,28 @@
 
 class BuilderDefinitionTest extends TestCase
 {
-    
+
     public function testBuilderImplementsDefinition()
     {
         $builder = new BuilderDefinition();
         $this->assertInstanceOf('Zend\Di\Definition\DefinitionInterface', $builder);
     }
-    
+
     public function testBuilderCanBuildClassWithMethods()
     {
         $class = new Builder\PhpClass();
         $class->setName('Foo');
         $class->addSuperType('Parent');
-        
+
         $injectionMethod = new Builder\InjectionMethod();
         $injectionMethod->setName('injectBar');
         $injectionMethod->addParameter('bar', 'Bar');
-        
+
         $class->addInjectionMethod($injectionMethod);
-        
+
         $definition = new BuilderDefinition();
         $definition->addClass($class);
-        
+
         $this->assertTrue($definition->hasClass('Foo'));
         $this->assertEquals('__construct', $definition->getInstantiator('Foo'));
         $this->assertContains('Parent', $definition->getClassSupertypes('Foo'));
@@ -50,17 +50,17 @@ public function testBuilderCanBuildClassWithMethods()
             $definition->getMethodParameters('Foo', 'injectBar')
         );
     }
-    
+
     public function testBuilderCanBuildFromArray()
     {
         $ini = ConfigFactory::fromFile(__DIR__ . '/../_files/sample.ini');
         $iniAsArray = $ini['section-b'];
         $definitionArray = $iniAsArray['di']['definitions'][1];
         unset($definitionArray['class']);
-        
+
         $definition = new BuilderDefinition();
         $definition->createClassesFromArray($definitionArray);
-        
+
         $this->assertTrue($definition->hasClass('My\DbAdapter'));
         $this->assertEquals('__construct', $definition->getInstantiator('My\DbAdapter'));
         $this->assertEquals(
@@ -70,21 +70,21 @@ public function testBuilderCanBuildFromArray()
             ),
             $definition->getMethodParameters('My\DbAdapter', '__construct')
         );
-        
+
         $this->assertTrue($definition->hasClass('My\Mapper'));
         $this->assertEquals('__construct', $definition->getInstantiator('My\Mapper'));
         $this->assertEquals(
             array('My\Mapper::__construct:0' => array('dbAdapter', 'My\DbAdapter', true)),
             $definition->getMethodParameters('My\Mapper', '__construct')
         );
-        
+
         $this->assertTrue($definition->hasClass('My\Repository'));
         $this->assertEquals('__construct', $definition->getInstantiator('My\Repository'));
         $this->assertEquals(
             array('My\Repository::__construct:0' => array('mapper', 'My\Mapper', true)),
             $definition->getMethodParameters('My\Repository', '__construct')
         );
-        
+
     }
 
     public function testCanCreateClassFromFluentInterface()
@@ -94,7 +94,7 @@ public function testCanCreateClassFromFluentInterface()
 
         $this->assertTrue($builder->hasClass('Foo'));
     }
-    
+
     public function testCanCreateInjectionMethodsAndPopulateFromFluentInterface()
     {
         $builder = new BuilderDefinition();
diff --git a/test/Definition/CompilerDefinitionTest.php b/test/Definition/CompilerDefinitionTest.php
index c3a7a179..27a18833 100644
--- a/test/Definition/CompilerDefinitionTest.php
+++ b/test/Definition/CompilerDefinitionTest.php
@@ -24,7 +24,7 @@ public function testCompilerCompilesAgainstConstructorInjectionAssets()
         $definition->compile();
 
         $this->assertTrue($definition->hasClass('ZendTest\Di\TestAsset\CompilerClasses\A'));
-        
+
         $assertClasses = array(
             'ZendTest\Di\TestAsset\CompilerClasses\A',
             'ZendTest\Di\TestAsset\CompilerClasses\B',
@@ -38,14 +38,14 @@ public function testCompilerCompilesAgainstConstructorInjectionAssets()
 
         // @todo this needs to be resolved, not the short name
         // $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\C', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\D'));
-        
+
         $this->assertEquals('__construct', $definition->getInstantiator('ZendTest\Di\TestAsset\CompilerClasses\A'));
         $this->assertTrue($definition->hasMethods('ZendTest\Di\TestAsset\CompilerClasses\C'));
-        
+
 
         $this->assertArrayHasKey('setB', $definition->getMethods('ZendTest\Di\TestAsset\CompilerClasses\C'));
         $this->assertTrue($definition->hasMethod('ZendTest\Di\TestAsset\CompilerClasses\C', 'setB'));
-        
+
         $this->assertEquals(
             array('ZendTest\Di\TestAsset\CompilerClasses\C::setB:0' => array('b', 'ZendTest\Di\TestAsset\CompilerClasses\B', true)),
             $definition->getMethodParameters('ZendTest\Di\TestAsset\CompilerClasses\C', 'setB')
@@ -64,7 +64,7 @@ public function testCompilerSupertypes()
         $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\C', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\E'));
         $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\D', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\E'));
     }
-    
+
     public function testCompilerDirectoryScannerAndFileScanner()
     {
         $definition = new CompilerDefinition;
@@ -75,7 +75,7 @@ public function testCompilerDirectoryScannerAndFileScanner()
         $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\C', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\E'));
         $this->assertContains('ZendTest\Di\TestAsset\CompilerClasses\D', $definition->getClassSupertypes('ZendTest\Di\TestAsset\CompilerClasses\E'));
     }
-    
+
     public function testCompilerFileScanner()
     {
         $definition = new CompilerDefinition;
diff --git a/test/InstanceManagerTest.php b/test/InstanceManagerTest.php
index 079450aa..970732b3 100644
--- a/test/InstanceManagerTest.php
+++ b/test/InstanceManagerTest.php
@@ -15,27 +15,27 @@
 
 class InstanceManagerTest extends TestCase
 {
-    
+
     public function testInstanceManagerCanPersistInstances()
     {
         $im = new InstanceManager();
         $obj = new TestAsset\BasicClass();
         $im->addSharedInstance($obj, 'ZendTest\Di\TestAsset\BasicClass');
         $this->assertTrue($im->hasSharedInstance('ZendTest\Di\TestAsset\BasicClass'));
-        $this->assertSame($obj, $im->getSharedInstance('ZendTest\Di\TestAsset\BasicClass')); 
+        $this->assertSame($obj, $im->getSharedInstance('ZendTest\Di\TestAsset\BasicClass'));
     }
-    
+
     public function testInstanceManagerCanPersistInstancesWithParameters()
     {
         $im = new InstanceManager();
         $obj1 = new TestAsset\BasicClass();
         $obj2 = new TestAsset\BasicClass();
         $obj3 = new TestAsset\BasicClass();
-        
+
         $im->addSharedInstance($obj1, 'foo');
         $im->addSharedInstanceWithParameters($obj2, 'foo', array('foo' => 'bar'));
         $im->addSharedInstanceWithParameters($obj3, 'foo', array('foo' => 'baz'));
-        
+
         $this->assertSame($obj1, $im->getSharedInstance('foo'));
         $this->assertSame($obj2, $im->getSharedInstanceWithParameters('foo', array('foo' => 'bar')));
         $this->assertSame($obj3, $im->getSharedInstanceWithParameters('foo', array('foo' => 'baz')));
@@ -80,7 +80,7 @@ public function testInstanceManagerResolvesRecursiveAliasesForConfiguration()
 
         $config['injections'] = array();
         $config['shared'] = true;
-        
+
         $this->assertEquals($config, $im->getConfiguration('foo-alias'));
     }
 
diff --git a/test/TestAsset/BasicClass.php b/test/TestAsset/BasicClass.php
index 93da3441..d9923478 100644
--- a/test/TestAsset/BasicClass.php
+++ b/test/TestAsset/BasicClass.php
@@ -12,5 +12,5 @@
 
 class BasicClass
 {
-    
+
 }
diff --git a/test/TestAsset/CircularClasses/A.php b/test/TestAsset/CircularClasses/A.php
index 8ad527ca..2bb95291 100644
--- a/test/TestAsset/CircularClasses/A.php
+++ b/test/TestAsset/CircularClasses/A.php
@@ -14,6 +14,6 @@ class A
 {
     public function __construct(B $b)
     {
-        
+
     }
 }
diff --git a/test/TestAsset/CircularClasses/C.php b/test/TestAsset/CircularClasses/C.php
index 43c1391c..6e1631e5 100644
--- a/test/TestAsset/CircularClasses/C.php
+++ b/test/TestAsset/CircularClasses/C.php
@@ -14,6 +14,6 @@ class C
 {
     public function __construct(D $d)
     {
-        
+
     }
 }
diff --git a/test/TestAsset/CircularClasses/D.php b/test/TestAsset/CircularClasses/D.php
index 6a3974ff..61170047 100644
--- a/test/TestAsset/CircularClasses/D.php
+++ b/test/TestAsset/CircularClasses/D.php
@@ -14,6 +14,6 @@ class D
 {
     public function __construct(E $e)
     {
-        
+
     }
 }
diff --git a/test/TestAsset/CircularClasses/E.php b/test/TestAsset/CircularClasses/E.php
index 71e5bb00..d0e11917 100644
--- a/test/TestAsset/CircularClasses/E.php
+++ b/test/TestAsset/CircularClasses/E.php
@@ -14,6 +14,6 @@ class E
 {
     public function __construct(C $c)
     {
-        
+
     }
 }
diff --git a/test/TestAsset/CircularClasses/X.php b/test/TestAsset/CircularClasses/X.php
index 7934b370..ff9c0e67 100644
--- a/test/TestAsset/CircularClasses/X.php
+++ b/test/TestAsset/CircularClasses/X.php
@@ -14,6 +14,6 @@ class X
 {
     public function __construct(X $x)
     {
-        
+
     }
 }
diff --git a/test/TestAsset/CompilerClasses/B.php b/test/TestAsset/CompilerClasses/B.php
index a96bc5c0..79f74e1f 100644
--- a/test/TestAsset/CompilerClasses/B.php
+++ b/test/TestAsset/CompilerClasses/B.php
@@ -14,6 +14,6 @@ class B
 {
     public function __construct(B $b)
     {
-        
+
     }
 }
diff --git a/test/TestAsset/CompilerClasses/C.php b/test/TestAsset/CompilerClasses/C.php
index 9afd7a7a..b6b9a680 100644
--- a/test/TestAsset/CompilerClasses/C.php
+++ b/test/TestAsset/CompilerClasses/C.php
@@ -14,6 +14,6 @@ class C
 {
     public function setB(B $b)
     {
-        
+
     }
 }
diff --git a/test/TestAsset/InheritanceClasses/A.php b/test/TestAsset/InheritanceClasses/A.php
index 418bdf13..e65cd54b 100644
--- a/test/TestAsset/InheritanceClasses/A.php
+++ b/test/TestAsset/InheritanceClasses/A.php
@@ -13,7 +13,7 @@
 class A
 {
     public $test;
- 
+
     public function setTest($test)
     {
         $this->test = $test;
diff --git a/test/TestAsset/PreferredImplClasses/D.php b/test/TestAsset/PreferredImplClasses/D.php
index a9b11e1d..792335e9 100644
--- a/test/TestAsset/PreferredImplClasses/D.php
+++ b/test/TestAsset/PreferredImplClasses/D.php
@@ -12,5 +12,5 @@
 
 class D extends C
 {
-    
+
 }
diff --git a/test/_files/config.yml b/test/_files/config.yml
index 880ef3ff..8cc57d6f 100644
--- a/test/_files/config.yml
+++ b/test/_files/config.yml
@@ -27,7 +27,7 @@ testing:
                 setObject:
                     name: setObject
                     params:
-                        - 
+                        -
                             __reference: params
         -
             class: ZendTest\Di\TestAsset\InspectedClass
@@ -39,4 +39,4 @@ testing:
         params:    ZendTest\Di\TestAsset\DummyParams
         injected:  ZendTest\Di\TestAsset\InjectedMethod
         inspected: ZendTest\Di\TestAsset\InspectedClass
-        
+
diff --git a/test/_files/definition-array.php b/test/_files/definition-array.php
index 7f724aed..4557e750 100644
--- a/test/_files/definition-array.php
+++ b/test/_files/definition-array.php
@@ -1,20 +1,20 @@
 <?php return array (
-  'My\\DbAdapter' => 
+  'My\\DbAdapter' =>
   array (
-    'superTypes' => 
+    'superTypes' =>
     array (
     ),
     'instantiator' => '__construct',
     'methods' =>
     array (
-      '__construct' => 
+      '__construct' =>
       array (
         'username' => NULL,
         'password' => NULL,
       ),
     ),
   ),
-  'My\\EntityA' => 
+  'My\\EntityA' =>
   array (
     'supertypes' =>
     array (
@@ -24,7 +24,7 @@
     array (
     ),
   ),
-  'My\\Mapper' => 
+  'My\\Mapper' =>
   array (
     'supertypes' =>
     array (
@@ -33,27 +33,27 @@
     'instantiator' => '__construct',
     'methods' =>
     array (
-      'setDbAdapter' => 
+      'setDbAdapter' =>
       array (
         'dbAdapter' => 'My\\DbAdapter',
       ),
     ),
   ),
-  'My\\RepositoryA' => 
+  'My\\RepositoryA' =>
   array (
     'superTypes' =>
     array (
     ),
     'instantiator' => '__construct',
-    'injectionMethods' => 
+    'injectionMethods' =>
     array (
-      'setMapper' => 
+      'setMapper' =>
       array (
         'mapper' => 'My\\Mapper',
       ),
     ),
   ),
-  'My\\RepositoryB' => 
+  'My\\RepositoryB' =>
   array (
     'superTypes' =>
     array (