Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated composer.json and run-tests.php

- Added phpunit/phpunit under require-dev section
- Removed bin-dir (this was incorrectly done)
- Added bin setting
- Referenced phpunit bin inside run-tests.php

Currently, this doesn't work -- somehow, various phpunit autoloaders are being
loaded multiple times, raising conflicts.
  • Loading branch information...
commit 5f2225fd8fea521545e412bcebc9218fd1648409 1 parent c8c1a84
@weierophinney authored
Showing with 6 additions and 5 deletions.
  1. +5 −4 composer.json
  2. +1 −1  tests/run-tests.php
View
9 composer.json
@@ -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
2  tests/run-tests.php
@@ -31,7 +31,7 @@
// 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_conf = (file_exists('phpunit.xml') ? 'phpunit.xml' : 'phpunit.xml.dist');
$phpunit_opts = "-c $phpunit_conf";
$phpunit_coverage = '';
Please sign in to comment.
Something went wrong with that request. Please try again.