Permalink
Browse files

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

…pace
  • Loading branch information...
1 parent d7e332b commit 6cf372f928b183fe2bfbc5c56f75abc75cfff509 @mtdowling mtdowling committed Jan 15, 2012
Showing with 5 additions and 4 deletions.
  1. +4 −1 composer.json
  2. +1 −3 tests/bootstrap.php
View
@@ -64,6 +64,9 @@
"zend/zend-log": "*"
},
"autoload": {
- "psr-0": { "Guzzle": "src/" }
+ "psr-0": {
+ "Guzzle\\Tests": "tests/",
+ "Guzzle": "src/"
+ }
}
}
View
@@ -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';

0 comments on commit 6cf372f

Please sign in to comment.