Merge branch '4.1'

Author: GrahamCampbell

.gitattributes

@@ -6,7 +6,8 @@
 /.github export-ignore
 /.gitignore export-ignore
 /.github export-ignore
-/phpstan.neon.dist export-ignore
+/Makefile export-ignore
+/phpstan.src.neon.dist export-ignore
 /phpstan.tests.neon.dist export-ignore
 /phpunit.xml.dist export-ignore
 /psalm.xml export-ignore

.github/workflows/tests.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
 
 jobs:
-  tests_latest:
+  latest:
     name: PHP ${{ matrix.php }} Latest
     runs-on: ubuntu-20.04
 
@@ -27,26 +27,17 @@ jobs:
       - name: Setup Problem Matchers
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-      - name: Install PHP 5/7 Dependencies
+      - name: Install Latest Dependencies
         uses: nick-invision/retry@v1
         with:
           timeout_minutes: 5
           max_attempts: 5
           command: composer update --no-interaction --no-progress
-        if: "matrix.php < 8"
-
-      - name: Install PHP 8 Dependencies
-        uses: nick-invision/retry@v1
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer update --no-interaction --no-progress --ignore-platform-reqs
-        if: "matrix.php >= 8"
 
       - name: Execute PHPUnit
         run: vendor/bin/phpunit
 
-  tests_lowest:
+  lowest:
     name: PHP ${{ matrix.php }} Lowest
     runs-on: ubuntu-20.04
 

composer.json

@@ -27,7 +27,7 @@
     "require-dev": {
         "ext-filter": "*",
         "bamarni/composer-bin-plugin": "^1.4.1",
-        "phpunit/phpunit": "^7.5.20 || ^8.5.2 || ^9.0"
+        "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.4"
     },
     "autoload": {
         "psr-4": {