diff options
| author | Michal Čihař <michal@cihar.com> | 2014-04-22 16:10:37 +0400 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2014-04-22 16:10:37 +0400 |
| commit | 6daf0773c2855ef592bb422d610f4444955e159c (patch) | |
| tree | 73d3e081cd4db4c67ff772789bc39254a25cf7de | |
| parent | a119547d228a9754fad1ff6ccd861a0b72eae747 (diff) | |
Revert "Install all testing deps by composer"
This reverts commit 0ace239d8d0acb57bf43e3155302cc9ec95e975e.
We can not use composer as we use system phpunit, which does not
autoload extensions.
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | composer.json | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index a4f35bf8da..35d6b2b353 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,9 @@ before_script: phpenv config-add test/travis.php.ini ; + pear channel-discover pear.phpunit.de ; + pear install phpunit/PHPUnit_Selenium ; + composer install --dev --no-interaction ; fi ; diff --git a/composer.json b/composer.json index e5c79ed78c..c67a71ff46 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,6 @@ "php": ">=5.3.0" }, "require-dev": { - "satooshi/php-coveralls": ">=0.6", - "phpunit/phpunit": ">=3.7", - "phpunit/phpunit-selenium": ">=1.2" + "satooshi/php-coveralls": ">=0.6" } } |