From ad7e29230bf3be9560bd1d16ea16a2da4d6d2f8c Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 3 Dec 2025 11:16:24 +0100 Subject: [PATCH 1/4] feat: support php 8.5 Signed-off-by: Jan Kowalleck --- HISTORY.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 446228f4..7048f535 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -6,6 +6,12 @@ All notable changes to this project will be documented in this file. +* Added + * Officially support PHP 8.5 ([#566] via [#]) + +[#566]: https://github.com/CycloneDX/cyclonedx-php-library/issues/566 +[#]: + ## 3.9.0 - 2025-12-02 * Added From 588e6e0d6b86596835bf72ce849bc442fc1028ba Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 3 Dec 2025 11:17:25 +0100 Subject: [PATCH 2/4] feat: support php 8.5 Signed-off-by: Jan Kowalleck --- HISTORY.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 7048f535..9e2a105c 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -7,10 +7,10 @@ All notable changes to this project will be documented in this file. * Added - * Officially support PHP 8.5 ([#566] via [#]) + * Officially support PHP 8.5 ([#566] via [#574]) [#566]: https://github.com/CycloneDX/cyclonedx-php-library/issues/566 -[#]: +[#574]: https://github.com/CycloneDX/cyclonedx-php-library/pull/574 ## 3.9.0 - 2025-12-02 From 58d39f1f0c79514ca49afe278871f85f4ec8870d Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 3 Dec 2025 11:18:25 +0100 Subject: [PATCH 3/4] feat: support php 8.5 Signed-off-by: Jan Kowalleck --- .github/workflows/php-dev.yml | 5 +++-- .github/workflows/php.yml | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/php-dev.yml b/.github/workflows/php-dev.yml index 382d042a..e1a0b25d 100644 --- a/.github/workflows/php-dev.yml +++ b/.github/workflows/php-dev.yml @@ -29,7 +29,7 @@ concurrency: permissions: {} env: - PHP_VERSION_LATEST: "8.4" + PHP_VERSION_LATEST: "8.5" PHP_PROJECT_EXT: dom,filter,json,libxml,simplexml # via `composer info -pt` jobs: @@ -44,7 +44,8 @@ jobs: - "macos-latest" - "windows-latest" php: - - "8.4" # highest supported + - "8.5" # highest supported + - "8.4" - "8.3" - "8.2" - "8.1" # lowest supported diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index fce5d4c7..abbd7866 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -21,7 +21,7 @@ permissions: {} env: PHP_VERSION_LOWEST: "8.1" # lowest supported - PHP_VERSION_LATEST: "8.4" # highest supported + PHP_VERSION_LATEST: "8.5" # highest supported PHP_PROJECT_EXT: dom,json,libxml,simplexml # via `composer info -pt` REPORTS_DIR: CI_reports TESTS_REPORTS_ARTIFACT: tests-reports @@ -54,7 +54,8 @@ jobs: matrix: os: [ "ubuntu-latest", "windows-latest", "macos-latest" ] php: - - "8.4" # highest supported + - "8.5" # highest supported + - "8.4" - "8.3" - "8.2" - "8.1" # lowest supported @@ -152,7 +153,7 @@ jobs: matrix: include: - # highest supported - php: "8.4" + php: "8.5" dependencies: "highest" - # lowest supported php: "8.1" From b47c5ae5c597c8284b4adb1cf2efeb6cac5908c6 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 3 Dec 2025 11:27:01 +0100 Subject: [PATCH 4/4] tools Signed-off-by: Jan Kowalleck --- tools/composer-require-checker/composer.json | 2 +- tools/php-cs-fixer/composer.json | 2 +- tools/phpunit/composer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/composer-require-checker/composer.json b/tools/composer-require-checker/composer.json index 8af4ab26..ecec7392 100644 --- a/tools/composer-require-checker/composer.json +++ b/tools/composer-require-checker/composer.json @@ -6,7 +6,7 @@ "php": "^8.1.31" }, "require-dev": { - "maglnet/composer-require-checker": "4.7.1||4.16.1", + "maglnet/composer-require-checker": "4.7.1||4.16.1||4.19.0", "roave/security-advisories": "dev-latest" }, "prefer-stable": true, diff --git a/tools/php-cs-fixer/composer.json b/tools/php-cs-fixer/composer.json index 02d9c1ac..cc723424 100644 --- a/tools/php-cs-fixer/composer.json +++ b/tools/php-cs-fixer/composer.json @@ -6,7 +6,7 @@ "php": "^8.1.31" }, "require-dev": { - "friendsofphp/php-cs-fixer": "3.91.0", + "friendsofphp/php-cs-fixer": "3.91.2", "roave/security-advisories": "dev-latest" }, "prefer-stable": true, diff --git a/tools/phpunit/composer.json b/tools/phpunit/composer.json index 2715cae8..09173c99 100644 --- a/tools/phpunit/composer.json +++ b/tools/phpunit/composer.json @@ -6,7 +6,7 @@ "php": "^8.1.31" }, "require-dev": { - "phpunit/phpunit": "10.5.45||11.5.7||12.0.2", + "phpunit/phpunit": "10.5.45||11.5.7||12.4.5", "roave/security-advisories": "dev-latest" }, "prefer-stable": true,