Merge pull request #511 from ciaranmcnulty/current-phpspec

Current phpspec
phpspec · Dec 10, 2020 · 14b40a8 · 14b40a8
2 parents 3b8a14d + 202923c
commit 14b40a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,22 +14,19 @@ matrix:
   include:
     - php: 7.2
       dist: bionic
-      env: DEPENDENCIES='low'
+      env: COMPOSER_FLAGS='--prefer-lowest'
     - php: 7.2
       dist: bionic
     - php: 7.3
       dist: bionic
     - php: 7.4
       dist: bionic
     - php: nightly
-      env: COMPOSER_FLAGS='--ignore-platform-reqs' COMPOSER_FORCE='phpspec/phpspec dev-master#5c6b6a5737420af057170b246ba9941acaa11614'
   fast_finish: true
 
 install:
   - export COMPOSER_ROOT_VERSION=dev-master
-  - if [ -n "$COMPOSER_FORCE" ]; then composer require $COMPOSER_FORCE --no-update ; fi;
-  - if [ "$DEPENDENCIES" != "low" ]; then composer update $COMPOSER_FLAGS; fi;
-  - if [ "$DEPENDENCIES" == "low" ]; then composer update $COMPOSER_FLAGS --prefer-lowest; fi;
+  - composer update $COMPOSER_FLAGS
 
 script:
   - vendor/bin/phpspec run -fpretty -v

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
 
     "require-dev": {
         "phpspec/phpspec": "^6.0",
-        "phpunit/phpunit": "^8.0 || ^9.0 <9.3"
+        "phpunit/phpunit": "^8.0 || ^9.0"
     },
 
     "autoload": {