Merge branch '3.6' into 4.1

Author: GrahamCampbell

.gitattributes

@@ -6,7 +6,6 @@
 /.github export-ignore
 /.gitignore export-ignore
 /.github export-ignore
-/.travis.yml export-ignore
 /Makefile export-ignore
 /phpstan.src.neon.dist export-ignore
 /phpstan.tests.neon.dist export-ignore

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+        php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
 
     steps:
       - name: Checkout Code
@@ -40,7 +40,7 @@ jobs:
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer update --no-interaction --no-progress --ignore-platform-reqs
+          command: composer update --no-interaction --no-progress --ignore-platform-req=php
         if: "matrix.php >= 8"
 
       - name: Execute PHPUnit

.travis.yml

@@ -24,7 +24,7 @@
         "ext-filter": "*",
         "ext-pcre": "*",
         "bamarni/composer-bin-plugin": "^1.4.1",
-        "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0"
+        "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20"
     },
     "autoload": {
         "psr-4": {