Merge branch '2.x' into 3.x

Author: jrfnl

.github/workflows/lint.yml

@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', 'nightly']
+        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5', 'nightly']
 
     continue-on-error: ${{ matrix.php == 'nightly' }}
 

.github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
         phpunit: ['auto']
         coverage: [true]
         experimental: [false]
@@ -105,6 +105,10 @@ jobs:
             phpunit: '11.3.6'
             coverage: true
             experimental: false
+          - php: '8.5'
+            phpunit: '11.5.37'
+            coverage: true
+            experimental: false
 
           # Experimental builds.
           - php: 'nightly'
@@ -232,6 +236,7 @@ jobs:
           # - PHPUnit 8 supports PHP 8.2 as of PHPUnit 8.5.19 (for our purposes).
           # - PHPUnit 8 supports PHP 8.3 as of PHPUnit 8.5.19 (for our purposes).
           # - PHPUnit 8 supports PHP 8.4 as of PHPUnit 8.5.40 (for our purposes).
+          # - PHPUnit 8 supports PHP 8.5 as of PHPUnit 8.5.43 (for our purposes).
           # - PHPUnit 8 does not support running code coverage on PHP 8.0 or higher.
           - php: '7.2'
             phpunit: '8.0'
@@ -243,9 +248,9 @@ jobs:
             coverage: true
           - php: '8.0'
             phpunit: '8.5.12'
-          - php: '8.4'
-            phpunit: '8.5.40'
-          - php: '8.4'
+          - php: '8.5'
+            phpunit: '8.5.43'
+          - php: '8.5'
             phpunit: '8'
 
           # PHPUnit 9 is fully supported for the officially supported PHP versions.
@@ -255,6 +260,7 @@ jobs:
           # - PHPUnit 9 supports PHP 8.2 as of PHPUnit 9.5.8 (for our purposes).
           # - PHPUnit 9 supports PHP 8.3 as of PHPUnit 9.5.8 (for our purposes).
           # - PHPUnit 9 supports PHP 8.4 as of PHPUnit 9.6.21 (for our purposes).
+          # - PHPUnit 9 supports PHP 8.5 as of PHPUnit 9.6.26 (for our purposes).
           - php: '7.3'
             phpunit: '9.0'
             coverage: true
@@ -272,13 +278,18 @@ jobs:
             phpunit: '9.6.21'
           - php: '8.4'
             phpunit: '9'
+          - php: '8.5'
+            phpunit: '9.6.26'
+          - php: '8.5'
+            phpunit: '9'
             coverage: true
 
           # PHPUnit 10 is NOT supported in PHPUnit Polyfills 3.x.
 
           # PHPUnit 11 is fully supported for the officially supported PHP versions.
           # Caveats:
           # - PHPUnit 11 supports PHP 8.4 as of PHPUnit 11.3.6 (for our purposes).
+          # - PHPUnit 11 supports PHP 8.5 as of PHPUnit 11.5.37 (for our purposes).
           #
           # Mind: code coverage can not be run on PHPUnit 11.2.0 - 11.3.2.
           # For a full explanation, see above (in the strategy for the other test job).
@@ -296,6 +307,10 @@ jobs:
             phpunit: '11.3.6'
           - php: '8.4'
             phpunit: '11'
+          - php: '8.5'
+            phpunit: '11.5.37'
+          - php: '8.5'
+            phpunit: '11'
             coverage: true
 
           # Experimental builds.