Merge branch 'main' into ci/php-8.4

dunglas · web-flow · commit babad16ac7c3 · 2024-11-26T14:36:06.000+01:00
diff --git a/tests/Fixtures/TestBundle/Document/TypedScalarValueTrait.php b/tests/Fixtures/TestBundle/Document/TypedScalarValueTrait.php
@@ -14,12 +14,12 @@
 
 trait TypedScalarValueTrait
 {
-    public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = []): array|string|int|float|bool
+    public function normalize(NormalizerInterface $normalizer, ?string $format = null, array $context = []): array|string|int|float|bool
     {
         return $this->value;
     }
 
-    public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, string $format = null, array $context = []): void
+    public function denormalize(DenormalizerInterface $denormalizer, array|string|int|float|bool $data, ?string $format = null, array $context = []): void
     {
         $this->value = $data;
     }

Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@`
`14`	`14`
`15`	`15`	`trait TypedScalarValueTrait`
`16`	`16`	`{`
`17`		`- public function normalize(NormalizerInterface $normalizer, string $format = null, array $context = []): array\|string\|int\|float\|bool`
	`17`	`+ public function normalize(NormalizerInterface $normalizer, ?string $format = null, array $context = []): array\|string\|int\|float\|bool`
`18`	`18`	`{`
`19`	`19`	`return $this->value;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public function denormalize(DenormalizerInterface $denormalizer, array\|string\|int\|float\|bool $data, string $format = null, array $context = []): void`
	`22`	`+ public function denormalize(DenormalizerInterface $denormalizer, array\|string\|int\|float\|bool $data, ?string $format = null, array $context = []): void`
`23`	`23`	`{`
`24`	`24`	`$this->value = $data;`
`25`	`25`	`}`