Hotfix/composer phpunit #2689

Merged
merged 4 commits into from Oct 5, 2012
View
@@ -12,7 +12,8 @@
"php": ">=5.3.3"
},
"require-dev": {
- "doctrine/common": ">=2.1"
+ "doctrine/common": ">=2.1",
+ "phpunit/PHPUnit": "3.7.*"
},
"suggest": {
"doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
@@ -27,9 +28,9 @@
"ZendTest\\": "tests/"
}
},
- "config": {
- "bin-dir": "bin"
- },
+ "bin": [
+ "bin/classmap_generator.php"
+ ],
"replace": {
"zendframework/zend-acl": "self.version",
"zendframework/zend-authentication": "self.version",
View
@@ -31,7 +31,8 @@
// PHPUnit doesn't understand relative paths well when they are in the config file.
chdir(__DIR__);
-$phpunit_bin = 'phpunit';
+$phpunit_bin = __DIR__ . '/../vendor/bin/phpunit';
+$phpunit_bin = file_exists($phpunit_bin) ? $phpunit_bin : 'phpunit';
$phpunit_conf = (file_exists('phpunit.xml') ? 'phpunit.xml' : 'phpunit.xml.dist');
$phpunit_opts = "-c $phpunit_conf";
$phpunit_coverage = '';