bug #45322 Fix generic type for FormErrorIterator (akalineskou)

fabpot · fabpot · commit 2e32f2f7f641 · 2022-02-05T11:03:34.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- Fix generic type for FormErrorIterator | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | - | License | MIT | Doc PR | -  After upgrading symfony/form (v5.4.2 => v5.4.3) I was getting weird phpstan errors ``` Instanceof between Symfony\Component\Form\FormError and Symfony\Component\Form\FormErrorIterator will always evaluate to false. ``` I pass `FormErrorIterator $formErrors` and iterate over it, and do different things if it's an instance of `FormErrorIterator` or `FormError` This change fixes it It was introduced here https://github.com/symfony/symfony/pull/42471/files#diff-48af5e26fa9979e5508cc18c8921ed13fd1a870706108285bada83f18278ff8eR32 Commits ------- cf8db14 Fix generic type for FormErrorIterator
diff --git a/src/Symfony/Component/Form/FormErrorIterator.php b/src/Symfony/Component/Form/FormErrorIterator.php
@@ -30,8 +30,8 @@
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @implements \ArrayAccess<int, FormError|FormErrorIterator>
- * @implements \RecursiveIterator<int, FormError>
- * @implements \SeekableIterator<int, FormError>
+ * @implements \RecursiveIterator<int, FormError|FormErrorIterator>
+ * @implements \SeekableIterator<int, FormError|FormErrorIterator>
  */
 class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \ArrayAccess, \Countable
 {

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@`
`30`	`30`	`* @author Bernhard Schussek <[email protected]>`
`31`	`31`	`*`
`32`	`32`	`* @implements \ArrayAccess<int, FormError\|FormErrorIterator>`
`33`		`- * @implements \RecursiveIterator<int, FormError>`
`34`		`- * @implements \SeekableIterator<int, FormError>`
	`33`	`+ * @implements \RecursiveIterator<int, FormError\|FormErrorIterator>`
	`34`	`+ * @implements \SeekableIterator<int, FormError\|FormErrorIterator>`
`35`	`35`	`*/`
`36`	`36`	`class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \ArrayAccess, \Countable`
`37`	`37`	`{`