Fix merge

nicolas-grekas · nicolas-grekas · commit 3b4e4ac12e71 · 2025-08-29T17:28:56.000+02:00
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -573,7 +573,7 @@ public function hasMetadataFor($value): bool
     }
 
     /**
-     * @return array<array{0: mixed, 1: bool}>
+     * @return iterable<array{0: mixed, 1: bool}>
      */
     public static function provideInvalidDiscriminatorTypes(): iterable
     {

Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,7 @@ public function hasMetadataFor($value): bool`
`573`	`573`	`}`
`574`	`574`
`575`	`575`	`/**`
`576`		`- * @return array<array{0: mixed, 1: bool}>`
	`576`	`+ * @return iterable<array{0: mixed, 1: bool}>`
`577`	`577`	`*/`
`578`	`578`	`public static function provideInvalidDiscriminatorTypes(): iterable`
`579`	`579`	`{`