Merge branch '2.6' into 3.6

Author: GrahamCampbell

.travis.yml

@@ -4,41 +4,41 @@ jobs:
       dist: trusty
       language: php
       php: hhvm-3.18
-      before_install: composer self-update --2 && travis_retry composer require "phpunit/phpunit:^5.7.27" --dev --no-update -n
-      install: travis_retry composer update -n -o
+      before_install: travis_retry composer self-update --2
+      install: travis_retry composer update --no-interaction --no-progress
       script: vendor/bin/phpunit
     - name: HHVM 3.24
       dist: trusty
       language: php
       php: hhvm-3.24
-      before_install: composer self-update --2 && travis_retry composer require "phpunit/phpunit:^5.7.27" --dev --no-update -n
-      install: travis_retry composer update -n -o
+      before_install: travis_retry composer self-update --2
+      install: travis_retry composer update --no-interaction --no-progress
       script: vendor/bin/phpunit
     - name: HHVM 3.30
       dist: trusty
       language: php
       php: hhvm-3.30
-      before_install: composer self-update --2 && travis_retry composer require "phpunit/phpunit:^5.7.27" --dev --no-update -n
-      install: travis_retry composer update -n -o
+      before_install: travis_retry composer self-update --2
+      install: travis_retry composer update --no-interaction --no-progress
       script: vendor/bin/phpunit
     - name: PHP 5.4
       dist: trusty
       language: php
       php: 5.4
-      before_install: composer self-update --2
-      install: travis_retry composer update -n -o
+      before_install: travis_retry composer self-update --2
+      install: travis_retry composer update --no-interaction --no-progress
       script: vendor/bin/phpunit
     - name: PHP 5.5.9
       dist: trusty
       language: php
       php: 5.5.9
-      before_install: composer self-update --2
-      install: travis_retry composer update -n -o
+      before_install: travis_retry composer self-update --2
+      install: travis_retry composer update --no-interaction --no-progress
       script: vendor/bin/phpunit
     - name: PHP 5.5
       dist: trusty
       language: php
       php: 5.5
-      before_install: composer self-update --2
-      install: travis_retry composer update -n -o
+      before_install: travis_retry composer self-update --2
+      install: travis_retry composer update --no-interaction --no-progress
       script: vendor/bin/phpunit

composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": "^5.4 || ^7.0 || ^8.0",
         "phpoption/phpoption": "^1.5.2",
-        "symfony/polyfill-ctype": "^1.16"
+        "symfony/polyfill-ctype": "^1.17"
     },
     "require-dev": {
         "ext-filter": "*",
@@ -35,8 +35,7 @@
         "ext-pcre": "Required to use most of the library."
     },
     "config": {
-        "preferred-install": "dist",
-        "platform-check": false
+        "preferred-install": "dist"
     },
     "extra": {
         "branch-alias": {