Add experimental PHP 8.5 support to CI workflow and run-tests.sh

Author: lkrms

.gitattributes

@@ -16,6 +16,7 @@
 /phpstan-baseline-8.2.neon linguist-generated
 /phpstan-baseline-8.3.neon linguist-generated
 /phpstan-baseline-8.4.neon linguist-generated
+/phpstan-baseline-8.5.neon linguist-generated
 /phpunit* export-ignore
 /scripts export-ignore
 /src/Toolkit/Cli/CliOptionBuilder.php linguist-generated

.github/workflows/ci.yml

@@ -105,6 +105,7 @@ jobs:
           - "8.1"
           - "8.0"
           - "7.4"
+          - "8.5"
 
     runs-on: ubuntu-24.04
 
@@ -172,6 +173,8 @@ jobs:
             php-version: "7.4"
           - os: windows-latest
             php-version: "7.4"
+          - os: ubuntu-24.04
+            php-version: "8.5"
 
     runs-on: ${{ matrix.os }}
 

phpstan-baseline-8.5.neon

@@ -19,15 +19,19 @@ function run() {
 }
 
 function run_with_php_versions() {
-    local php versions=()
+    local php version versions=()
     while [[ -z $1 ]] || [[ $1 == [78][0-9] ]]; do
         if type -P "php$1" >/dev/null; then
             versions[${#versions[@]}]=php$1
         fi
         shift
     done
     for php in "${versions[@]-php}"; do
-        run "$php" "$@" || failed[${#failed[@]}]="$* on $php"
+        version=${php#php}
+        version=${version:-$(php -r 'echo PHP_MAJOR_VERSION . PHP_MINOR_VERSION;')}
+        run "$php" "$@" ||
+            ((version > released)) ||
+            failed[${#failed[@]}]="$* on $php"
     done
 }
 
@@ -45,14 +49,15 @@ function on_exit() {
     die "must run from root of package folder"
 
 failed=()
+released=84
 
 run scripts/generate.php --check
 run php84 tools/php-cs-fixer check --diff --verbose
 run tools/pretty-php --diff
-run_with_php_versions 84 74 83 82 81 80 vendor/bin/phpstan
+run_with_php_versions 84 74 83 82 81 80 85 vendor/bin/phpstan
 run scripts/stop-mockoon.sh || (($? == 1)) || die 'error stopping mockoon'
 run scripts/start-mockoon.sh >/dev/null
 trap on_exit EXIT
-run_with_php_versions 84 74 83 82 81 80 vendor/bin/phpunit
+run_with_php_versions 84 74 83 82 81 80 85 vendor/bin/phpunit
 
 [[ -z ${failed+1} ]]