From c96a4387aa1f51ea7edee69aa8b9d6b87d8380b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 12:40:52 +0100 Subject: [PATCH] tools(deps-dev): Update friendsofphp/php-cs-fixer requirement from 3.48.0 to 3.49.0 in /tools/php-cs-fixer (#402) * tools(deps-dev): Update friendsofphp/php-cs-fixer requirement Updates the requirements on [friendsofphp/php-cs-fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer) to permit the latest version. - [Release notes](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases) - [Changelog](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.48.0...v3.49.0) --- updated-dependencies: - dependency-name: friendsofphp/php-cs-fixer dependency-type: direct:development ... Signed-off-by: dependabot[bot] * apply code style Signed-off-by: Jan Kowalleck * docs Signed-off-by: Jan Kowalleck * docs Signed-off-by: Jan Kowalleck --------- Signed-off-by: dependabot[bot] Signed-off-by: Jan Kowalleck Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jan Kowalleck --- HISTORY.md | 7 ++----- src/Core/Models/BomRef.php | 2 +- src/Core/Serialization/BaseSerializer.php | 2 +- src/Core/Serialization/Serializer.php | 2 +- tools/php-cs-fixer/composer.json | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 1859ae29..8c0e95d8 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -4,16 +4,13 @@ All notable changes to this project will be documented in this file. ## unreleased -## 3.1.1 - 2024-01-20 - -Maintenance Release. - * Style - * Applied latest PHP Coding Standards (via [#395], [#398], [#399]) + * Applied latest PHP Coding Standards (via [#395], [#398], [#399], [#402]) [#395]: https://github.com/CycloneDX/cyclonedx-php-library/pull/395 [#398]: https://github.com/CycloneDX/cyclonedx-php-library/pull/398 [#399]: https://github.com/CycloneDX/cyclonedx-php-library/pull/399 +[#402]: https://github.com/CycloneDX/cyclonedx-php-library/pull/402 ## 3.1.0 - 2023-12-02 diff --git a/src/Core/Models/BomRef.php b/src/Core/Models/BomRef.php index 9b03118e..325cc571 100644 --- a/src/Core/Models/BomRef.php +++ b/src/Core/Models/BomRef.php @@ -38,7 +38,7 @@ final class BomRef /** @psalm-var non-empty-string|null */ private ?string $value; - public function __construct(string $value = null) + public function __construct(?string $value = null) { $this->setValue($value); } diff --git a/src/Core/Serialization/BaseSerializer.php b/src/Core/Serialization/BaseSerializer.php index a184e9d4..3a1841db 100644 --- a/src/Core/Serialization/BaseSerializer.php +++ b/src/Core/Serialization/BaseSerializer.php @@ -84,7 +84,7 @@ private function normalize(Bom $bom) /** * @SuppressWarnings(PHPMD.BooleanArgumentFlag) */ - final public function serialize(Bom $bom, bool $prettyPrint = null): string + final public function serialize(Bom $bom, ?bool $prettyPrint = null): string { return $this->realSerialize( $this->normalize($bom), diff --git a/src/Core/Serialization/Serializer.php b/src/Core/Serialization/Serializer.php index e9eacb3e..a3922c72 100644 --- a/src/Core/Serialization/Serializer.php +++ b/src/Core/Serialization/Serializer.php @@ -41,5 +41,5 @@ interface Serializer * * @SuppressWarnings(PHPMD.BooleanArgumentFlag) */ - public function serialize(Bom $bom, bool $prettyPrint = null): string; + public function serialize(Bom $bom, ?bool $prettyPrint = null): string; } diff --git a/tools/php-cs-fixer/composer.json b/tools/php-cs-fixer/composer.json index 8716c454..bb97f2f4 100644 --- a/tools/php-cs-fixer/composer.json +++ b/tools/php-cs-fixer/composer.json @@ -6,7 +6,7 @@ "php": "^8.1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "3.48.0", + "friendsofphp/php-cs-fixer": "3.49.0", "roave/security-advisories": "dev-latest" }, "prefer-stable": true,