Merge pull request zendframework#4744 from bakura10/remove-zend-test

Remove ZendTest from Composer
HolgerW1 · Jun 28, 2013 · 01d94f1 · 01d94f1
2 parents dfc8b33 + 3bf60a3
commit 01d94f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -28,8 +28,7 @@
     },
     "autoload": {
         "psr-0": {
-            "Zend\\": "library/",
-            "ZendTest\\": "tests/"
+            "Zend\\": "library/"
         }
     },
     "bin": [

diff --git a/tests/_autoload.php b/tests/_autoload.php
@@ -3,17 +3,13 @@
  * 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',
-                 'ZendTest' => __DIR__ . '/ZendTest',
-             ),
-        ));
-    $loader->register();
-}
+include_once __DIR__ . '/../vendor/autoload.php';
+
+$loader = new Zend\Loader\StandardAutoloader(
+    array(
+        Zend\Loader\StandardAutoloader::LOAD_NS => array(
+            'ZendTest' => __DIR__ . '/ZendTest',
+        ),
+    )
+);
+$loader->register();