tools(deps-dev): Update friendsofphp/php-cs-fixer requirement from 3.16.0 to 3.17.0 in /tools/php-cs-fixer (#302)

dependabot[bot] · jkowalleck · web-flow · commit fa0ade0e2b1e · 2023-05-27T09:37:10.000+02:00
* 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](PHP-CS-Fixer/PHP-CS-Fixer@v3.16.0...v3.17.0) --- updated-dependencies: - dependency-name: friendsofphp/php-cs-fixer dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> * apply cs-fixes Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jan Kowalleck <jan.kowalleck@gmail.com>
diff --git 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
@@ -82,11 +82,9 @@ private function normalize(BOM $bom)
     }
 
     /**
-     * {@inheritDoc}
-     *
      * @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/DOM/Normalizers/BomNormalizer.php b/src/Core/Serialization/DOM/Normalizers/BomNormalizer.php
@@ -75,8 +75,8 @@ public function normalize(Bom $bom): DOMElement
     private function normalizeSerialNumber(?string $serialNumber): ?string
     {
         // @TODO have the regex configurable per Spec
-        return \is_string($serialNumber) &&
-            1 === preg_match('/^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$|^\\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\\}$/', $serialNumber)
+        return \is_string($serialNumber)
+            && 1 === preg_match('/^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$|^\\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\\}$/', $serialNumber)
                 ? $serialNumber
                 : null;
     }
diff --git a/src/Core/Serialization/JSON/Normalizers/BomNormalizer.php b/src/Core/Serialization/JSON/Normalizers/BomNormalizer.php
@@ -81,8 +81,8 @@ public function normalize(Bom $bom): array
     private function normalizeSerialNumber(?string $serialNumber): ?string
     {
         // @TODO have the regex configurable per Spec
-        return \is_string($serialNumber) &&
-            1 === preg_match('/^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/', $serialNumber)
+        return \is_string($serialNumber)
+            && 1 === preg_match('/^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/', $serialNumber)
                  ? $serialNumber
                  : null;
     }
diff --git 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/src/Core/Validation/Validators/JsonStrictValidator.php b/src/Core/Validation/Validators/JsonStrictValidator.php
@@ -32,8 +32,6 @@
 class JsonStrictValidator extends JsonValidator
 {
     /**
-     * {@inheritdoc}
-     *
      * @internal
      */
     protected static function listSchemaFiles(): array
diff --git a/src/Core/Validation/Validators/JsonValidator.php b/src/Core/Validation/Validators/JsonValidator.php
@@ -40,8 +40,6 @@
 class JsonValidator extends BaseValidator
 {
     /**
-     * {@inheritdoc}
-     *
      * @internal as this function may be affected by breaking changes without notice
      */
     protected static function listSchemaFiles(): array
diff --git a/src/Core/Validation/Validators/XmlValidator.php b/src/Core/Validation/Validators/XmlValidator.php
@@ -38,8 +38,6 @@
 class XmlValidator extends BaseValidator
 {
     /**
-     * {@inheritdoc}
-     *
      * @internal as this function may be affected by breaking changes without notice
      */
     protected static function listSchemaFiles(): array
diff --git a/tools/php-cs-fixer/composer.json b/tools/php-cs-fixer/composer.json
@@ -3,7 +3,7 @@
     "description": "php-cs-fixer",
     "type": "metapackage",
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "3.16.0",
+        "friendsofphp/php-cs-fixer": "3.17.0",
         "roave/security-advisories": "dev-latest"
     },
     "prefer-stable": true,

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ final class BomRef`
`38`	`38`	`/** @psalm-var non-empty-string\|null */`
`39`	`39`	`private ?string $value;`
`40`	`40`
`41`		`- public function __construct(?string $value = null)`
	`41`	`+ public function __construct(string $value = null)`
`42`	`42`	`{`
`43`	`43`	`$this->setValue($value);`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,11 +82,9 @@ private function normalize(BOM $bom)`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`/**`
`85`		`- * {@inheritDoc}`
`86`		`- *`
`87`	`85`	`* @SuppressWarnings(PHPMD.BooleanArgumentFlag)`
`88`	`86`	`*/`
`89`		`- final public function serialize(Bom $bom, ?bool $prettyPrint = null): string`
	`87`	`+ final public function serialize(Bom $bom, bool $prettyPrint = null): string`
`90`	`88`	`{`
`91`	`89`	`return $this->realSerialize(`
`92`	`90`	`$this->normalize($bom),`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,8 @@ public function normalize(Bom $bom): DOMElement`
`75`	`75`	`private function normalizeSerialNumber(?string $serialNumber): ?string`
`76`	`76`	`{`
`77`	`77`	`// @TODO have the regex configurable per Spec`
`78`		`- return \is_string($serialNumber) &&`
`79`		`- 1 === preg_match('/^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$\|^\\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\\}$/', $serialNumber)`
	`78`	`+ return \is_string($serialNumber)`
	`79`	`+ && 1 === preg_match('/^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$\|^\\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\\}$/', $serialNumber)`
`80`	`80`	`? $serialNumber`
`81`	`81`	`: null;`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ public function normalize(Bom $bom): array`
`81`	`81`	`private function normalizeSerialNumber(?string $serialNumber): ?string`
`82`	`82`	`{`
`83`	`83`	`// @TODO have the regex configurable per Spec`
`84`		`- return \is_string($serialNumber) &&`
`85`		`- 1 === preg_match('/^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/', $serialNumber)`
	`84`	`+ return \is_string($serialNumber)`
	`85`	`+ && 1 === preg_match('/^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/', $serialNumber)`
`86`	`86`	`? $serialNumber`
`87`	`87`	`: null;`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@ interface Serializer`
`41`	`41`	`*`
`42`	`42`	`* @SuppressWarnings(PHPMD.BooleanArgumentFlag)`
`43`	`43`	`*/`
`44`		`- public function serialize(Bom $bom, ?bool $prettyPrint = null): string;`
	`44`	`+ public function serialize(Bom $bom, bool $prettyPrint = null): string;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@`
`32`	`32`	`class JsonStrictValidator extends JsonValidator`
`33`	`33`	`{`
`34`	`34`	`/**`
`35`		`- * {@inheritdoc}`
`36`		`- *`
`37`	`35`	`* @internal`
`38`	`36`	`*/`
`39`	`37`	`protected static function listSchemaFiles(): array`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@`
`40`	`40`	`class JsonValidator extends BaseValidator`
`41`	`41`	`{`
`42`	`42`	`/**`
`43`		`- * {@inheritdoc}`
`44`		`- *`
`45`	`43`	`* @internal as this function may be affected by breaking changes without notice`
`46`	`44`	`*/`
`47`	`45`	`protected static function listSchemaFiles(): array`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@`
`38`	`38`	`class XmlValidator extends BaseValidator`
`39`	`39`	`{`
`40`	`40`	`/**`
`41`		`- * {@inheritdoc}`
`42`		`- *`
`43`	`41`	`* @internal as this function may be affected by breaking changes without notice`
`44`	`42`	`*/`
`45`	`43`	`protected static function listSchemaFiles(): array`