From 23c2c531081057c1e5ea0cad118eb676995613a8 Mon Sep 17 00:00:00 2001
From: Xaver Loppenstedt <xaver@loppenstedt.de>
Date: Fri, 19 Sep 2025 10:38:01 +0200
Subject: [PATCH 1/3] Add PHP 8.5

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c74bb2..3c766f5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,6 +45,7 @@ jobs:
           - 8.2
           - 8.3
           - 8.4
+          - 8.5
         dependencies_level:
           - --prefer-lowest
           - ""

From 6a6ff9fb9af6b6b894bff1249a7b6c5437a51b48 Mon Sep 17 00:00:00 2001
From: Xaver Loppenstedt <xaver@loppenstedt.de>
Date: Fri, 19 Sep 2025 11:03:57 +0200
Subject: [PATCH 2/3] Add workaround for Psalm and PHP 8.5

---
 .github/workflows/ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3c766f5..f11f815 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,7 +78,11 @@ jobs:
           key: "cache-composer-${{ hashFiles('composer.json') }}"
           restore-keys: 'cache-composer-'
       - name: Run composer
+        if: ${{ matrix.php_version != '8.5' }}
         run: composer update ${{ matrix.dependencies_level }} --prefer-dist --no-interaction --no-progress
+      - name: Run composer PHP 8.5 workaround
+        if: ${{ matrix.php_version == '8.5' }}
+        run: composer update ${{ matrix.dependencies_level }} --ignore-platform-reqs --prefer-dist --no-interaction --no-progress
       - name: Check composer.json
         run: composer normalize --dry-run
       - name: Run tests
@@ -88,7 +92,7 @@ jobs:
       - name: Run PHPStan
         run: vendor/bin/phpstan analyse --no-progress
       - name: Run psalm
-        if: ${{ matrix.os != 'windows-latest' }}
+        if: ${{ matrix.os != 'windows-latest' && matrix.php_version != '8.5' }}
         run: vendor/bin/psalm
       - name: Run phan
         if: ${{ matrix.os != 'windows-latest' }}

From cb779e013baa3ee70aedaa6ee6aac8c92490846c Mon Sep 17 00:00:00 2001
From: Xaver Loppenstedt <xaver@loppenstedt.de>
Date: Fri, 19 Sep 2025 11:09:39 +0200
Subject: [PATCH 3/3] Add workaround for Phan and PHP 8.5

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f11f815..9380cd1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,7 +95,7 @@ jobs:
         if: ${{ matrix.os != 'windows-latest' && matrix.php_version != '8.5' }}
         run: vendor/bin/psalm
       - name: Run phan
-        if: ${{ matrix.os != 'windows-latest' }}
+        if: ${{ matrix.os != 'windows-latest' && matrix.php_version != '8.5' }}
         run: vendor/bin/phan
       # AST 1.1 binary for Windows seems to be missing on PECL
       - name: Run phan with polyfill