tests/bootstrap.php now works with the composer autoloader

tedious · Oct 23, 2012 · f39f96e · f39f96e
1 parent cd8d47b
commit f39f96e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -19,6 +19,9 @@
     "php": ">=5.3.0"
   },
   "autoload": {
-    "psr-0": {"Stash": "src/"}
+    "psr-0": {
+     	"Stash": "src/",
+     	"Stash\\Test": "tests/"
+     }
   }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -14,18 +14,11 @@
                         // use this anywhere else in the project since that would defeat the point of testing.
 error_reporting(-1);
 
-spl_autoload_register(function($class) {
+$filename = __DIR__ .'/../vendor/autoload.php';
-    if (0 === strpos($class, 'Stash\\Test\\')) {
+
-        $file = __DIR__ . '/../tests/' . str_replace('\\', '/', $class) . '.php';
+if (!file_exists($filename)) {
-        if (file_exists($file)) {
+    throw new Exception("You need to execute `composer install` before running the tests. (vendors are required for test execution)");
-            require_once $file;
+}
-            return true;
+
-        }
+require_once $filename;
-    } elseif (0 === strpos($class, 'Stash\\')) {
+
-        $file = __DIR__ . '/../src/' . str_replace('\\', '/', $class) . '.php';
-        if (file_exists($file)) {
-            require_once $file;
-            return true;
-        }
-    }
-});