remove zendtest

bnkr · Jun 28, 2013 · 7c077f5 · 7c077f5
1 parent fc69a35
commit 7c077f5
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/tests/_autoload.php b/tests/_autoload.php
@@ -3,12 +3,16 @@
  * Setup autoloading
  */
 
-require_once __DIR__ . '/../library/Zend/Loader/StandardAutoloader.php';
-$loader = new Zend\Loader\StandardAutoloader(
-    array(
-         Zend\Loader\StandardAutoloader::LOAD_NS => array(
-             'Zend'     => __DIR__ . '/../library/Zend',
-             'ZendTest' => __DIR__ . '/ZendTest',
-         ),
-    ));
-$loader->register();
+if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
+    include_once __DIR__ . '/../vendor/autoload.php';
+} else {
+    // if composer autoloader is missing, explicitly add the ZF library path
+    require_once __DIR__ . '/../library/Zend/Loader/StandardAutoloader.php';
+    $loader = new Zend\Loader\StandardAutoloader(
+        array(
+            Zend\Loader\StandardAutoloader::LOAD_NS => array(
+                'Zend' => __DIR__ . '/../library/Zend'
+            ),
+        ));
+    $loader->register();
+}