From 1e178329de8a656411d4ad8d0ce5e2096cda488a Mon Sep 17 00:00:00 2001 From: Xaver Loppenstedt Date: Fri, 19 Sep 2025 10:38:01 +0200 Subject: [PATCH 1/4] 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 bc7a054..4c5d779 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 bae9971dd4689b2981ed90307b899384ac0bf28b Mon Sep 17 00:00:00 2001 From: Xaver Loppenstedt Date: Fri, 19 Sep 2025 11:03:57 +0200 Subject: [PATCH 2/4] 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 4c5d779..2e531fd 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 e392a304766cb72c7c62a8fcd61894c12e995dd6 Mon Sep 17 00:00:00 2001 From: Xaver Loppenstedt Date: Fri, 19 Sep 2025 11:09:39 +0200 Subject: [PATCH 3/4] 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 2e531fd..6573e65 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 From fd4304d67cf47eb5c52e4827b0943c038cd2ea94 Mon Sep 17 00:00:00 2001 From: Xaver Loppenstedt Date: Thu, 4 Dec 2025 16:38:08 +0100 Subject: [PATCH 4/4] Revert "Add workaround for Phan and PHP 8.5" This reverts commit cb779e013baa3ee70aedaa6ee6aac8c92490846c. --- .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 6573e65..2e531fd 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' && matrix.php_version != '8.5' }} + if: ${{ matrix.os != 'windows-latest' }} run: vendor/bin/phan # AST 1.1 binary for Windows seems to be missing on PECL - name: Run phan with polyfill