From 11a471c1e458280f20c497b80adfad3fe8543708 Mon Sep 17 00:00:00 2001 From: Jaapio Date: Wed, 12 Nov 2025 21:13:25 +0100 Subject: [PATCH] Add support for php 8.5 Allow composer php 8.5, and test on 8.5 --- .github/settings.yml | 18 ++++++++++++++++++ .github/workflows/tests.yaml | 4 ++-- composer.json | 2 +- composer.lock | 8 ++++---- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index ff41759..868d0bf 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -126,6 +126,18 @@ rulesets: integration_id: 15368 - context: 'Tests with Composer (PHP 8.4, PHPUnit 12 & lowest dependencies)' integration_id: 15368 + - context: 'Tests with Composer (PHP 8.5, PHPUnit 10 & highest dependencies)' + integration_id: 15368 + - context: 'Tests with Composer (PHP 8.5, PHPUnit 10 & lowest dependencies)' + integration_id: 15368 + - context: 'Tests with Composer (PHP 8.5, PHPUnit 11 & highest dependencies)' + integration_id: 15368 + - context: 'Tests with Composer (PHP 8.5, PHPUnit 11 & lowest dependencies)' + integration_id: 15368 + - context: 'Tests with Composer (PHP 8.5, PHPUnit 12 & highest dependencies)' + integration_id: 15368 + - context: 'Tests with Composer (PHP 8.5, PHPUnit 12 & lowest dependencies)' + integration_id: 15368 - context: 'Tests with PHAR (PHP 8.1 & PHPUnit 10)' integration_id: 15368 - context: 'Tests with PHAR (PHP 8.2 & PHPUnit 10)' @@ -144,6 +156,12 @@ rulesets: integration_id: 15368 - context: 'Tests with PHAR (PHP 8.4 & PHPUnit 12)' integration_id: 15368 + - context: 'Tests with PHAR (PHP 8.5 & PHPUnit 10)' + integration_id: 15368 + - context: 'Tests with PHAR (PHP 8.5 & PHPUnit 11)' + integration_id: 15368 + - context: 'Tests with PHAR (PHP 8.5 & PHPUnit 12)' + integration_id: 15368 - context: 'Test coverage' integration_id: 15368 bypass_actors: diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index eda2fe3..afc742c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - php-version: ["8.1", "8.2", "8.3", "8.4"] + php-version: ["8.1", "8.2", "8.3", "8.4", "8.5"] phpunit-version: ["10", "11", "12"] dependencies: ["highest", "lowest"] exclude: @@ -62,7 +62,7 @@ jobs: strategy: fail-fast: false matrix: - php-version: ["8.1", "8.2", "8.3", "8.4"] + php-version: ["8.1", "8.2", "8.3", "8.4", "8.5"] phpunit-version: ["10", "11", "12"] exclude: - php-version: "8.1" diff --git a/composer.json b/composer.json index d130846..52fcb9f 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ } ], "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0", "phpunit/phpunit": "^10.5.46 || ^11.5.11 || ^12.0.6" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 72937cb..3f05663 100644 --- a/composer.lock +++ b/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": "df674f6075c48541a97993b7eebcea4d", + "content-hash": "35e9ef4ae6daf5a2ea3c2b674f7c03d8", "packages": [ { "name": "myclabs/deep-copy", @@ -5772,12 +5772,12 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0" }, - "platform-dev": {}, + "platform-dev": [], "plugin-api-version": "2.6.0" }