Merge branch '8.5' into 9.5

Author: sebastianbergmann

.github/workflows/ci.yml

@@ -68,6 +68,8 @@ jobs:
       PHP_EXTENSIONS: none, curl, dom, json, libxml, mbstring, openssl, phar, soap, tokenizer, xml, xmlwriter
       PHP_INI_VALUES: assert.exception=1, zend.assertions=1, error_reporting=-1, log_errors_max_len=0, display_errors=On
 
+    continue-on-error: ${{ matrix.experimental }}
+
     strategy:
       fail-fast: false
       matrix:
@@ -81,7 +83,18 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
-          - "8.3"
+
+        experimental:
+          - false
+
+        include:
+          - os: ubuntu-latest
+            php-version: "8.3"
+            experimental: true
+
+          - os: windows-latest
+            php-version: "8.3"
+            experimental: true
 
     steps:
       - name: Configure git to avoid issues with line endings
@@ -102,13 +115,7 @@ jobs:
       - name: Install dependencies with Composer
         run: ./tools/composer update --no-ansi --no-interaction --no-progress
 
-      - name: Run tests with PHPUnit on stable PHP version
-        if: matrix.php-version != '8.3'
-        run: ./phpunit --testsuite unit
-
-      - name: Run tests with PHPUnit on unstable PHP version
-        if: matrix.php-version == '8.3'
-        continue-on-error: true
+      - name: Run tests with PHPUnit
         run: ./phpunit --testsuite unit
 
   end-to-end-tests:
@@ -123,6 +130,8 @@ jobs:
       PHP_EXTENSIONS: none, curl, dom, json, libxml, mbstring, openssl, phar, soap, tokenizer, xml, xmlwriter
       PHP_INI_VALUES: assert.exception=1, zend.assertions=1, error_reporting=-1, log_errors_max_len=0, display_errors=On
 
+    continue-on-error: ${{ matrix.experimental }}
+
     strategy:
       fail-fast: false
       matrix:
@@ -136,7 +145,18 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
-          - "8.3"
+
+        experimental:
+          - false
+
+        include:
+          - os: ubuntu-latest
+            php-version: "8.3"
+            experimental: true
+
+          - os: windows-latest
+            php-version: "8.3"
+            experimental: true
 
     steps:
       - name: Configure git to avoid issues with line endings
@@ -157,13 +177,7 @@ jobs:
       - name: Install dependencies with Composer
         run: ./tools/composer update --no-ansi --no-interaction --no-progress
 
-      - name: Run tests with PHPUnit on stable PHP version
-        if: matrix.php-version != '8.3'
-        run: ./phpunit --testsuite end-to-end
-
-      - name: Run tests with PHPUnit on unstable PHP version
-        if: matrix.php-version == '8.3'
-        continue-on-error: true
+      - name: Run tests with PHPUnit
         run: ./phpunit --testsuite end-to-end
 
   code-coverage: