Fixing composer.json so that it autoloads from the Guzzle\Tests names…

…pace
guzzle · Jan 15, 2012 · 6cf372f928b183fe2bfbc5c56f75abc75cfff509 · 6cf372f
1 parent d7e332b
commit 6cf372f928b183fe2bfbc5c56f75abc75cfff509
Unified Split

Showing with 5 additions and 4 deletions.

+4 −1 composer.json

+1 −3 tests/bootstrap.php
diff --git a/composer.json b/composer.json
@@ -64,6 +64,9 @@
         "zend/zend-log": "*"
     },
     "autoload": {
-        "psr-0": { "Guzzle": "src/" }
+        "psr-0": {
+            "Guzzle\\Tests": "tests/",
+            "Guzzle": "src/"
+        }
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -11,9 +11,7 @@
 require_once 'PHPUnit/TextUI/TestRunner.php';
 
 // Include the composer autoloader
-$loader = require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . '.composer' . DIRECTORY_SEPARATOR . 'autoload.php';
-// Register the Guzzle test namespace
-$loader->add('Guzzle\\Tests', __DIR__);
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . '.composer' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 // Add the services file to the default service builder
 $servicesFile = __DIR__ . DIRECTORY_SEPARATOR . 'Guzzle' . DIRECTORY_SEPARATOR . 'Tests' . DIRECTORY_SEPARATOR . 'TestData' . DIRECTORY_SEPARATOR . 'services.xml';