Have both composer and standard autoloader

HolgerW1 · Jun 28, 2013 · b8126fc · b8126fc
1 parent 7c077f5
commit b8126fc
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/tests/_autoload.php b/tests/_autoload.php
@@ -3,16 +3,14 @@
  * Setup autoloading
  */
 
-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();
-}
+include_once __DIR__ . '/../vendor/autoload.php';
+
+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();