diff options
| author | Michal Čihař <michal@cihar.com> | 2014-04-30 13:23:36 +0400 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2014-04-30 13:24:13 +0400 |
| commit | 2baa22b05a880c4f5e002229a7d0ae40fa9ea85b (patch) | |
| tree | 442282f116e2d4bfb6906a43256db02239fb1a73 | |
| parent | 72c9d6e436901d1c27329069900c685350324e2a (diff) | |
Install all testing deps by composer
PHPUnit is going to drop support for installation using PEAR, so let's
be prepared for that.
Signed-off-by: Michal Čihař <michal@cihar.com>
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | composer.json | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 4e49cef4ad..6a5e3ca7ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,9 +34,6 @@ 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 c67a71ff46..e5c79ed78c 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,8 @@ "php": ">=5.3.0" }, "require-dev": { - "satooshi/php-coveralls": ">=0.6" + "satooshi/php-coveralls": ">=0.6", + "phpunit/phpunit": ">=3.7", + "phpunit/phpunit-selenium": ">=1.2" } } |