From 5c5bd2c944f13a4e157d6c37cf34d84b7789737b Mon Sep 17 00:00:00 2001 From: Arne De Smedt Date: Thu, 19 Nov 2026 14:07:58 +0100 Subject: [PATCH 1/2] Add PHP 8.6 support Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- .github/workflows/analyzers.yaml | 4 ++-- .github/workflows/code-style.yaml | 2 +- .github/workflows/tests.yaml | 2 +- composer.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml index e82f960..d3480b4 100644 --- a/.github/workflows/analyzers.yaml +++ b/.github/workflows/analyzers.yaml @@ -7,7 +7,7 @@ jobs: strategy: matrix: operating-system: [ubuntu-latest] - php-versions: ['8.4', '8.5'] + php-versions: ['8.4', '8.5', '8.6'] composer-options: ['--ignore-platform-req=php+'] fail-fast: false name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} @@ -24,4 +24,4 @@ jobs: run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }} - name: Run the tests run: ./vendor/bin/psalm - continue-on-error: ${{ matrix.php-versions == '8.5' }} + continue-on-error: ${{ matrix.php-versions == '8.6' }} diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml index 6ad622d..a2c57f8 100644 --- a/.github/workflows/code-style.yaml +++ b/.github/workflows/code-style.yaml @@ -7,7 +7,7 @@ jobs: strategy: matrix: operating-system: [ubuntu-latest] - php-versions: ['8.4', '8.5'] + php-versions: ['8.4', '8.5', '8.6'] composer-options: ['--ignore-platform-req=php+'] fail-fast: false name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 5b8b80c..b6852a8 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -7,7 +7,7 @@ jobs: strategy: matrix: operating-system: [ubuntu-latest] - php-versions: ['8.4', '8.5'] + php-versions: ['8.4', '8.5', '8.6'] composer-options: ['--ignore-platform-req=php+'] fail-fast: false name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} diff --git a/composer.json b/composer.json index 2ee08f1..6d4f649 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ } ], "require": { - "php": "~8.4.0 || ~8.5.0", + "php": "~8.4.0 || ~8.5.0 || ~8.6.0", "ext-dom": "*", "php-standard-library/dict": "^6.1", "php-standard-library/foundation": "^6.1", From 79636ab9f17f96fc3d382b8579009696ee4b8d08 Mon Sep 17 00:00:00 2001 From: Toon Verwerft Date: Fri, 20 Nov 2026 10:55:38 +0100 Subject: [PATCH 2/2] Upgrade to psalm 7 and run CI on PHP 8.6 without overrides Psalm 6 does not install on PHP 8.6, so the 8.6 jobs only passed through --ignore-platform-req and continue-on-error. Psalm 7 does, and every other dependency supports 8.6 once the upstream php-soap packages are released, so the workflows drop both. --- .github/workflows/analyzers.yaml | 4 +--- .github/workflows/code-style.yaml | 3 +-- .github/workflows/tests.yaml | 3 +-- composer.json | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml index d3480b4..f34364b 100644 --- a/.github/workflows/analyzers.yaml +++ b/.github/workflows/analyzers.yaml @@ -8,7 +8,6 @@ jobs: matrix: operating-system: [ubuntu-latest] php-versions: ['8.4', '8.5', '8.6'] - composer-options: ['--ignore-platform-req=php+'] fail-fast: false name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} steps: @@ -21,7 +20,6 @@ jobs: tools: 'composer:v2' extensions: pcov, mbstring, posix, dom, soap - name: Install dependencies - run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }} + run: composer update --prefer-dist --no-progress --no-suggest - name: Run the tests run: ./vendor/bin/psalm - continue-on-error: ${{ matrix.php-versions == '8.6' }} diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml index a2c57f8..b5adf69 100644 --- a/.github/workflows/code-style.yaml +++ b/.github/workflows/code-style.yaml @@ -8,7 +8,6 @@ jobs: matrix: operating-system: [ubuntu-latest] php-versions: ['8.4', '8.5', '8.6'] - composer-options: ['--ignore-platform-req=php+'] fail-fast: false name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} steps: @@ -21,6 +20,6 @@ jobs: tools: 'composer:v2' extensions: pcov, mbstring, posix, dom, soap - name: Install dependencies - run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }} + run: composer update --prefer-dist --no-progress --no-suggest - name: Run the tests run: PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --dry-run diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index b6852a8..6813ed8 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -8,7 +8,6 @@ jobs: matrix: operating-system: [ubuntu-latest] php-versions: ['8.4', '8.5', '8.6'] - composer-options: ['--ignore-platform-req=php+'] fail-fast: false name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} steps: @@ -21,6 +20,6 @@ jobs: tools: 'composer:v2' extensions: pcov, mbstring, posix, dom, soap - name: Install dependencies - run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }} + run: composer update --prefer-dist --no-progress --no-suggest - name: Run the tests run: ./vendor/bin/phpunit diff --git a/composer.json b/composer.json index 6d4f649..ff70855 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ }, "require-dev": { "phpunit/phpunit": "~12.3", - "vimeo/psalm": "~6.13", + "vimeo/psalm": "~7.12", "php-cs-fixer/shim": "^3.88" } }