Fix PHPUnit version requirement to avoid ugly hack in Travis

danhunsaker · Feb 17, 2016 · db321b5 · db321b5
1 parent f04b4f8
commit db321b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ matrix:
     - php: hhvm
 install:
   - if [[ "$(phpenv version-name)" != "hhvm" ]]; then echo 'error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
-  - composer install $(ver="$(phpenv version-name)"; if [[ "${ver:0:3}" == "5.5" || "${ver:0:3}" == "5.4" ]]; then echo '--ignore-platform-reqs'; fi)
+  - composer install
 script:
   - php vendor/bin/behat --config=.travis-behat.yml
   - php vendor/bin/phpspec run -v --config=.travis-phpspec.yml

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "behat/behat": "^3.0",
         "henrikbjorn/phpspec-code-coverage": "^2.0",
         "phpspec/phpspec": "^2.4",
-        "phpunit/phpunit": "^5.0",
+        "phpunit/phpunit": "^4.0|^5.0",
         "rmiller/behat-spec": "^0.3"
     },
     "autoload": {