Updated bootstrap as per changes to composer.

Author: nickl-

tests/bootstrap.php

@@ -9,7 +9,7 @@
 if (file_exists(dirname(__DIR__).'/vendor/composer')) {
     $map = require dirname(__DIR__).'/vendor/composer/autoload_namespaces.php';
     foreach ($map as $path)
-        $paths[] = $path;
+        $paths = array_merge($paths, $path);
 }
 
 $paths[] = realpath(__DIR__.DIRECTORY_SEPARATOR.'src');
@@ -27,7 +27,7 @@ function($className) {
         if (isset($composerClassmap[$className]))
             return require $composerClassmap[$className];
 
-	$fileParts = explode('\\', ltrim($className, '\\'));
+        $fileParts = explode('\\', ltrim($className, '\\'));
 
         if (false !== strpos(end($fileParts), '_'))
             array_splice($fileParts, -1, 1, explode('_', current($fileParts)));