Merge branch '3.6' into 4.1

vlucas · Jun 2, 2020 · 333c21d · 333c21d
2 parents 0b32505 + 471ea86
commit 333c21d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,7 @@ jobs:
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.4-cli
     - name: PHP 8.0
       dist: bionic
-      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:8.0-base update -n -o --ignore-platform-reqs
+      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:8.0-base update -n -o --ignore-platform-req=php
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:8.0-cli
     - name: PHPStan
       dist: bionic

diff --git a/composer.json b/composer.json
@@ -17,14 +17,14 @@
     ],
     "require": {
         "php": "^5.5.9 || ^7.0 || ^8.0",
-        "phpoption/phpoption": "^1.7.2",
-        "symfony/polyfill-ctype": "^1.9"
+        "phpoption/phpoption": "^1.7.3",
+        "symfony/polyfill-ctype": "^1.16"
     },
     "require-dev": {
         "ext-filter": "*",
         "ext-pcre": "*",
         "bamarni/composer-bin-plugin": "^1.3",
-        "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
+        "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0"
     },
     "autoload": {
         "psr-4": {