Merge branch '7.2' into 7.3

nicolas-grekas · nicolas-grekas · commit 1b724a1c5e44 · 2025-07-10T10:47:49.000+02:00
* 7.2:
  -
  -
  CS fixes
diff --git a/SerializerInterface.php b/SerializerInterface.php
@@ -40,10 +40,10 @@ public function serialize(mixed $data, string $format, array $context = []): str
      * @param TType                $type
      * @param array<string, mixed> $context
      *
-     * @psalm-return (TType is class-string<TObject> ? TObject : mixed)
-     *
      * @phpstan-return ($type is class-string<TObject> ? TObject : mixed)
      *
+     * @psalm-return (TType is class-string<TObject> ? TObject : mixed)
+     *
      * @throws NotNormalizableValueException Occurs when a value cannot be denormalized
      * @throws UnexpectedValueException      Occurs when a value cannot be decoded
      * @throws ExceptionInterface            Occurs for all the other cases of serialization-related errors

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,10 @@ public function serialize(mixed $data, string $format, array $context = []): str`
`40`	`40`	`* @param TType $type`
`41`	`41`	`* @param array<string, mixed> $context`
`42`	`42`	`*`
`43`		`- * @psalm-return (TType is class-string<TObject> ? TObject : mixed)`
`44`		`- *`
`45`	`43`	`* @phpstan-return ($type is class-string<TObject> ? TObject : mixed)`
`46`	`44`	`*`
	`45`	`+ * @psalm-return (TType is class-string<TObject> ? TObject : mixed)`
	`46`	`+ *`
`47`	`47`	`* @throws NotNormalizableValueException Occurs when a value cannot be denormalized`
`48`	`48`	`* @throws UnexpectedValueException Occurs when a value cannot be decoded`
`49`	`49`	`* @throws ExceptionInterface Occurs for all the other cases of serialization-related errors`