Skip to content

Commit 31637df

Browse files
authored
feat: support PHP 8.5 (#595)
- fixes #587 --------- Signed-off-by: Jan Kowalleck <[email protected]>
1 parent c01002a commit 31637df

File tree

6 files changed

+17
-15
lines changed

6 files changed

+17
-15
lines changed

.github/workflows/php-dev.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ concurrency:
2727
permissions: {}
2828

2929
env:
30-
PHP_VERSION_LATEST: "8.4"
31-
PHP_PROJECT_EXT: dom,json,libxml # via `composer info -pt`
30+
PHP_VERSION_LATEST: "8.5"
31+
PHP_PROJECT_EXT: dom,json,libxml,phar,bcmath,json,mbstring,sodium,intl # via `composer info -pt` in root and all tools
3232

3333
jobs:
3434
assure-dev-setup:
@@ -39,7 +39,7 @@ jobs:
3939
matrix:
4040
os: [ "ubuntu-latest", "macos-latest", "windows-latest" ]
4141
php:
42-
- "8.4" # highest supported
42+
- "8.5" # highest supported
4343
- "8.1" # lowest supported
4444
timeout-minutes: 30
4545
steps:

.github/workflows/php.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ concurrency:
2121

2222
env:
2323
PHP_VERSION_LOWEST: "8.1" # lowest supported
24-
PHP_VERSION_LATEST: "8.4" # highest supported
25-
PHP_PROJECT_EXT: dom,json,libxml # via `composer info -pt`
24+
PHP_VERSION_LATEST: "8.5" # highest supported
25+
PHP_PROJECT_EXT: dom,json,libxml,phar,bcmath,json,mbstring,sodium,intl # via `composer info -pt` in root and all tools
2626
REPORTS_DIR: CI_reports
2727
TESTS_REPORTS_ARTIFACT: tests-reports
2828
TYPES_REPORTS_ARTIFACT: types-reports
@@ -54,19 +54,20 @@ jobs:
5454
matrix:
5555
os: [ "ubuntu-latest" ]
5656
php:
57-
- "8.4" # highest supported
57+
- "8.5" # highest supported
58+
- "8.4"
5859
- "8.3"
5960
- "8.2"
6061
- "8.1" # lowest supported
6162
dependencies: [ "lowest", "highest" ]
6263
include:
6364
- # Windows highest
6465
os: windows-latest
65-
php: "8.4"
66+
php: "8.5"
6667
dependencies: "highest"
6768
- # MacOS highest
6869
os: macos-latest
69-
php: "8.4"
70+
php: "8.5"
7071
dependencies: "highest"
7172
timeout-minutes: 30
7273
steps:
@@ -163,7 +164,7 @@ jobs:
163164
fail-fast: false
164165
matrix:
165166
php:
166-
- "8.4" # highest supported
167+
- "8.5" # highest supported
167168
- "8.1" # lowest supported
168169
composer:
169170
- "v2" # latest 2.x
@@ -177,7 +178,7 @@ jobs:
177178
dependencies: [ "highest" ]
178179
exclude:
179180
- # incompatible combination
180-
php: "8.4"
181+
php: "8.5"
181182
composer: "2.3"
182183
include:
183184
- # lowest supported

HISTORY.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@ All notable changes to this project will be documented in this file.
66

77
<!-- add unreleased items here -->
88

9+
* Added
10+
* Officially support PHP 8.5 ([#595] via [#587])
911
* Refactor
1012
* Migrated to `cyclonedx/cyclonedx-library:^3.9` (via [#594])
1113
* Dependencies
1214
* Raised dependency `cyclonedx/cyclonedx-library:^3.9`, was `:^3.3` (via [#594])
1315

1416
[#594]: https://github.com/CycloneDX/cyclonedx-php-composer/pull/594
17+
[#595]: https://github.com/CycloneDX/cyclonedx-php-composer/pull/595
18+
[#587]: https://github.com/CycloneDX/cyclonedx-php-composer/issues/587
1519

1620
## 6.0.0 - 2025-11-17
1721

tests/Functional/PluginTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
use CycloneDX\Composer\_internal\MakeBom\Options;
3131
use CycloneDX\Composer\Plugin;
3232
use PHPUnit\Framework\Attributes\CoversClass;
33-
use PHPUnit\Framework\Attributes\CoversNothing;
3433
use PHPUnit\Framework\Attributes\Depends;
3534
use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
3635
use PHPUnit\Framework\Attributes\UsesClass;
@@ -50,7 +49,6 @@ final class PluginTest extends TestCase
5049
* assert the correct setup as described in
5150
* {@link https://getcomposer.org/doc/articles/plugins.md#plugin-package the docs}.
5251
*/
53-
#[CoversNothing]
5452
public function testPackageIsComposerPlugin(): void
5553
{
5654
$composerJson = $this->getComposerJson();
@@ -61,7 +59,6 @@ public function testPackageIsComposerPlugin(): void
6159
* assert the correct setup as described in
6260
* {@link https://getcomposer.org/doc/articles/plugins.md#plugin-package the docs}.
6361
*/
64-
#[CoversNothing]
6562
public function testPluginIsRegistered(): string
6663
{
6764
$composerJson = $this->getComposerJson();

tools/composer-require-checker/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"php": "^8.1.31"
77
},
88
"require-dev": {
9-
"maglnet/composer-require-checker": "4.7.1||4.16.1",
9+
"maglnet/composer-require-checker": "4.7.1||4.19.0",
1010
"roave/security-advisories": "dev-latest"
1111
},
1212
"prefer-stable": true,

tools/phpunit/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"php": "^8.1.31"
77
},
88
"require-dev": {
9-
"phpunit/phpunit": "10.5.45||11.5.7||12.0.2",
9+
"phpunit/phpunit": "10.5.60||11.5.46||12.4.4",
1010
"roave/security-advisories": "dev-latest"
1111
},
1212
"prefer-stable": true,

0 commit comments

Comments
 (0)