Merge branch '8.5' into 9.5

Author: sebastianbergmann

.github/workflows/ci.yml

@@ -231,25 +231,15 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
+          - "8.2"
 
         coverage:
           - pcov
           - xdebug
 
-        experimental:
-          - false
-
-        include:
-          - php-version: "8.1"
-            experimental: true
-          - php-version: "8.2"
-            experimental: true
-
-    continue-on-error: ${{ matrix.experimental }}
-
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -275,7 +265,7 @@ jobs:
         run: ant run-phar-specific-tests-with-scoped-phar
 
       - uses: actions/upload-artifact@v2
-        if: ${{ matrix.php-version == 8.0 }}
+        if: ${{ matrix.php-version == 8.1 }}
         with:
           name: phpunit-snapshot-phar
           path: ./build/artifacts/phpunit-snapshot.phar