From ad49334d1bd57b8f8d76d86f987f29ca095c728d Mon Sep 17 00:00:00 2001 From: Michiel Gerritsen Date: Thu, 12 Nov 2026 12:24:38 +0100 Subject: [PATCH] Allow PHP 8.5 Widen the PHP constraint to ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0 and add PHP 8.5 to the CI and quality matrices. --- .github/workflows/ci.yml | 4 ++-- .github/workflows/quality.yml | 2 +- CHANGELOG.md | 8 ++++++++ composer.json | 2 +- tests/README.md | 6 +++--- tests/quality/composer.json | 2 +- tests/quality/composer.lock | 4 ++-- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a8044a..d75d11f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['8.2', '8.3', '8.4'] + php: ['8.2', '8.3', '8.4', '8.5'] container: php:${{ matrix.php }}-cli steps: - name: Install Git for committed-package regression checks @@ -52,7 +52,7 @@ jobs: run: php tests/php/run.php - name: Validate declared PHP constraint - run: php -r '$data=json_decode(file_get_contents("composer.json"), true, 512, JSON_THROW_ON_ERROR); if (($data["require"]["php"] ?? "") !== ">=8.2 <8.5") { exit(1); }' + run: php -r '$data=json_decode(file_get_contents("composer.json"), true, 512, JSON_THROW_ON_ERROR); if (($data["require"]["php"] ?? "") !== "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0") { exit(1); }' browser: name: Chromium loader and beacon checks diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index a5ac8cd..b82cd2a 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['8.2', '8.3', '8.4'] + php: ['8.2', '8.3', '8.4', '8.5'] dependencies: [lowest, stable] include: - php: '8.3' diff --git a/CHANGELOG.md b/CHANGELOG.md index b346d6a..0c1ccb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ Notable changes to Basicrum Analytics are recorded here. +## [Unreleased] + +### Changed + +- Allow PHP 8.5 (`~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0`). CI runs the focused + PHP checks, PHPStan level 8 and the Magento coding standard on PHP 8.5 as + well. The native release gate stays on Magento 2.4.7-p10 / PHP 8.3. + ## [0.1.1] - 2026-09-24 ### Added diff --git a/composer.json b/composer.json index 9af7f45..6bfa85c 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": ">=8.2 <8.5", + "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0", "magento/framework": "^103.0", "magento/module-backend": "^102.0", "magento/module-config": "^101.2", diff --git a/tests/README.md b/tests/README.md index a760015..25deb4c 100644 --- a/tests/README.md +++ b/tests/README.md @@ -62,13 +62,13 @@ job uploads an HTML report with traces from failed test attempts, retained for seven days. A flaky pass still fails the job; retries do not hide failures. Additional CI checks run Magento-aware PHPStan level 8 and Magento coding standards against real Magento components, with lowest/stable dependency -resolution on PHP 8.2–8.4 and a locked PHP 8.3 job. These component checks are +resolution on PHP 8.2–8.5 and a locked PHP 8.3 job. These component checks are not full-platform compatibility certification. The committed tooling lock requires -PHP 8.3 or 8.4 and resolves framework 103.0.9 (the Magento 2.4.9 component line). +PHP 8.3, 8.4 or 8.5 and resolves framework 103.0.9 (the Magento 2.4.9 component line). The locally tested PHP 8.3 lowest resolution uses framework 103.0.7 (2.4.7 GA), not 2.4.7-p10. CI's lowest/stable jobs resolve afresh for their PHP version; their logs report the exact component versions. No PHPStan run against the native -2.4.7-p10 dependency set is claimed. Run the locked tools locally on PHP 8.3/8.4: +2.4.7-p10 dependency set is claimed. Run the locked tools locally on PHP 8.3/8.4/8.5: ```sh composer --working-dir=tests/quality install --no-interaction --no-scripts diff --git a/tests/quality/composer.json b/tests/quality/composer.json index 06b4d4d..8a908e7 100644 --- a/tests/quality/composer.json +++ b/tests/quality/composer.json @@ -3,7 +3,7 @@ "description": "Isolated development tools; never installed with the module", "license": "MIT", "require": { - "php": ">=8.2 <8.5", + "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0", "magento/framework": "^103.0", "magento/module-backend": "^102.0", "magento/module-config": "^101.2", diff --git a/tests/quality/composer.lock b/tests/quality/composer.lock index b38225c..3449752 100644 --- a/tests/quality/composer.lock +++ b/tests/quality/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "377fec98d072edebb2020e286ae24f83", + "content-hash": "ff642ba775edc5040e09b425be902a8c", "packages": [ { "name": "aws/aws-crt-php", @@ -9596,7 +9596,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=8.2 <8.5" + "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0" }, "platform-dev": {}, "plugin-api-version": "2.9.0"