Fix more generic types

Signed-off-by: Alexander M. Turek <[email protected]>

Author: derrabus

Button.php

@@ -49,7 +49,7 @@ public function __construct(FormConfigInterface $config)
     /**
      * Unsupported method.
      *
-     * @param mixed $offset
+     * @param string $offset
      *
      * @return bool
      */
@@ -64,7 +64,7 @@ public function offsetExists($offset)
      *
      * This method should not be invoked.
      *
-     * @param mixed $offset
+     * @param string $offset
      *
      * @return FormInterface
      *
@@ -81,8 +81,8 @@ public function offsetGet($offset)
      *
      * This method should not be invoked.
      *
-     * @param mixed $offset
-     * @param mixed $value
+     * @param string        $offset
+     * @param FormInterface $value
      *
      * @return void
      *
@@ -99,7 +99,7 @@ public function offsetSet($offset, $value)
      *
      * This method should not be invoked.
      *
-     * @param mixed $offset
+     * @param string $offset
      *
      * @return void
      *

Extension/Validator/ViolationMapper/ViolationPath.php

@@ -17,11 +17,13 @@
 
 /**
  * @author Bernhard Schussek <[email protected]>
+ *
+ * @implements \IteratorAggregate<int, string>
  */
 class ViolationPath implements \IteratorAggregate, PropertyPathInterface
 {
     /**
-     * @var string[]
+     * @var list<string>
      */
     private $elements = [];
 

FormBuilderInterface.php

@@ -14,7 +14,7 @@
 /**
  * @author Bernhard Schussek <[email protected]>
  *
- * @extends \Traversable<string, self>
+ * @extends \Traversable<string, FormBuilderInterface>
  */
 interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuilderInterface
 {

FormErrorIterator.php

@@ -44,7 +44,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
     private $errors;
 
     /**
-     * @param array<int, FormError|self> $errors
+     * @param list<FormError|self> $errors
      *
      * @throws InvalidArgumentException If the errors are invalid
      */

Util/OrderedHashMap.php

@@ -82,14 +82,14 @@ class OrderedHashMap implements \ArrayAccess, \IteratorAggregate, \Countable
     /**
      * The keys of the map in the order in which they were inserted or changed.
      *
-     * @var array
+     * @var list<TKey>
      */
     private $orderedKeys = [];
 
     /**
      * References to the cursors of all open iterators.
      *
-     * @var array
+     * @var array<int, int>
      */
     private $managedCursors = [];
 
@@ -116,7 +116,7 @@ public function offsetExists($key)
     /**
      * {@inheritdoc}
      *
-     * @return mixed
+     * @return TValue
      */
     #[\ReturnTypeWillChange]
     public function offsetGet($key)

Util/OrderedHashMapIterator.php

@@ -18,54 +18,54 @@
  *
  * @internal
  *
- * @template TKey
- * @template TValue
+ * @template-covariant TKey of array-key
+ * @template-covariant TValue
  *
  * @implements \Iterator<TKey, TValue>
  */
 class OrderedHashMapIterator implements \Iterator
 {
     /**
-     * @var array
+     * @var array<TKey, TValue>
      */
     private $elements;
 
     /**
-     * @var array
+     * @var list<TKey>
      */
     private $orderedKeys;
 
     /**
      * @var int
      */
-    private $cursor;
+    private $cursor = 0;
 
     /**
      * @var int
      */
     private $cursorId;
 
     /**
-     * @var array
+     * @var array<int, int>
      */
     private $managedCursors;
 
     /**
-     * @var string|int|null
+     * @var TKey|null
      */
     private $key;
 
     /**
-     * @var mixed
+     * @var TValue|null
      */
     private $current;
 
     /**
      * @param array<TKey, TValue> $elements       The elements of the map, indexed by their
      *                                            keys
-     * @param array               $orderedKeys    The keys of the map in the order in which
+     * @param list<TKey>          $orderedKeys    The keys of the map in the order in which
      *                                            they should be iterated
-     * @param array               $managedCursors An array from which to reference the
+     * @param array<int, int>     $managedCursors An array from which to reference the
      *                                            iterator's cursor as long as it is alive.
      *                                            This array is managed by the corresponding
      *                                            {@link OrderedHashMap} instance to support
@@ -105,7 +105,7 @@ public function __destruct()
     /**
      * {@inheritdoc}
      *
-     * @return mixed
+     * @return TValue|null
      */
     #[\ReturnTypeWillChange]
     public function current()
@@ -132,7 +132,7 @@ public function next(): void
     /**
      * {@inheritdoc}
      *
-     * @return mixed
+     * @return TKey|null
      */
     #[\ReturnTypeWillChange]
     public function key()