Merge branch '5.4' into 6.0

* 5.4:
  [Console] Restore psr/log >= 3.0 conflict
  [Security] Make the abstract Voter class implement CacheableVoterInterface
  Add generic types to traversable implementations
  [Security] Fix TypeError message
  [Security] Fix deprecation layer
  [FrameworkBundle] Add completion for workflow:dump
  Fix cancel button
  Fix misleading error on missing provider with authenticator manager
  Don't limit retries of toolbar loading

Author: derrabus

Button.php

@@ -20,6 +20,8 @@
  * A form button.
  *
  * @author Bernhard Schussek <[email protected]>
+ *
+ * @implements \IteratorAggregate<string, FormInterface>
  */
 class Button implements \IteratorAggregate, FormInterface
 {
@@ -50,7 +52,7 @@ public function offsetExists(mixed $offset): bool
      *
      * @throws BadMethodCallException
      */
-    public function offsetGet(mixed $offset): mixed
+    public function offsetGet(mixed $offset): FormInterface
     {
         throw new BadMethodCallException('Buttons cannot have children.');
     }

ButtonBuilder.php

@@ -21,6 +21,8 @@
  * A builder for {@link Button} instances.
  *
  * @author Bernhard Schussek <[email protected]>
+ *
+ * @implements \IteratorAggregate<string, FormBuilderInterface>
  */
 class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
 {

ChoiceList/View/ChoiceGroupView.php

@@ -15,6 +15,8 @@
  * Represents a group of choices in templates.
  *
  * @author Bernhard Schussek <[email protected]>
+ *
+ * @implements \IteratorAggregate<array-key, ChoiceGroupView|ChoiceView>
  */
 class ChoiceGroupView implements \IteratorAggregate
 {
@@ -24,7 +26,7 @@ class ChoiceGroupView implements \IteratorAggregate
     /**
      * Creates a new choice group view.
      *
-     * @param ChoiceGroupView[]|ChoiceView[] $choices the choice views in the group
+     * @param array<array-key, ChoiceGroupView|ChoiceView> $choices the choice views in the group
      */
     public function __construct(string $label, array $choices = [])
     {
@@ -35,7 +37,7 @@ public function __construct(string $label, array $choices = [])
     /**
      * {@inheritdoc}
      *
-     * @return \Traversable<ChoiceGroupView|ChoiceView>
+     * @return \Traversable<array-key, ChoiceGroupView|ChoiceView>
      */
     public function getIterator(): \Traversable
     {

Extension/Validator/Constraints/FormValidator.php

@@ -24,6 +24,9 @@
  */
 class FormValidator extends ConstraintValidator
 {
+    /**
+     * @var \SplObjectStorage<FormInterface, array<int, string|string[]|GroupSequence>>
+     */
     private \SplObjectStorage $resolvedGroups;
 
     /**

Extension/Validator/ViolationMapper/ViolationPath.php

@@ -20,6 +20,7 @@
  */
 class ViolationPath implements \IteratorAggregate, PropertyPathInterface
 {
+    /** @var string[] */
     private array $elements = [];
     private array $isIndex = [];
     private array $mapsForm = [];

Form.php

@@ -66,6 +66,8 @@
  *
  * @author Fabien Potencier <[email protected]>
  * @author Bernhard Schussek <[email protected]>
+ *
+ * @implements \IteratorAggregate<string, FormInterface>
  */
 class Form implements \IteratorAggregate, FormInterface, ClearableErrorsInterface
 {
@@ -75,7 +77,7 @@ class Form implements \IteratorAggregate, FormInterface, ClearableErrorsInterfac
     /**
      * A map of FormInterface instances.
      *
-     * @var FormInterface[]|OrderedHashMap
+     * @var OrderedHashMap<string, FormInterface>
      */
     private OrderedHashMap $children;
 

FormBuilder.php

@@ -21,6 +21,8 @@
  * A builder for creating {@link Form} instances.
  *
  * @author Bernhard Schussek <[email protected]>
+ *
+ * @implements \IteratorAggregate<string, FormBuilderInterface>
  */
 class FormBuilder extends FormConfigBuilder implements \IteratorAggregate, FormBuilderInterface
 {

FormErrorIterator.php

@@ -28,6 +28,10 @@
  * flatten the recursive structure into a flat list of errors.
  *
  * @author Bernhard Schussek <[email protected]>
+ *
+ * @implements \ArrayAccess<int, FormError|FormErrorIterator>
+ * @implements \RecursiveIterator<int, FormError>
+ * @implements \SeekableIterator<int, FormError>
  */
 class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \ArrayAccess, \Countable
 {
@@ -40,8 +44,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
     private array $errors;
 
     /**
-     * @param FormError[]|self[] $errors An array of form errors and instances
-     *                                   of FormErrorIterator
+     * @param array<int, FormError|self> $errors
      *
      * @throws InvalidArgumentException If the errors are invalid
      */

FormInterface.php

@@ -17,6 +17,9 @@
  * A form group bundling multiple forms in a hierarchical structure.
  *
  * @author Bernhard Schussek <[email protected]>
+ *
+ * @extends \ArrayAccess<string, FormInterface>
+ * @extends \Traversable<string, FormInterface>
  */
 interface FormInterface extends \ArrayAccess, \Traversable, \Countable
 {

FormView.php

@@ -15,6 +15,9 @@
 
 /**
  * @author Bernhard Schussek <[email protected]>
+ *
+ * @implements \ArrayAccess<string, FormView>
+ * @implements \IteratorAggregate<string, FormView>
  */
 class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
 {