symfony · fabpot · Nov 4, 2021 · Nov 3, 2021
diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php
@@ -31,7 +31,7 @@ final class MessengerTransportDoctrineSchemaSubscriber implements EventSubscribe
     private $transports;
 
     /**
-     * @param iterable<int, TransportInterface> $transports
+     * @param iterable<mixed, TransportInterface> $transports
      */
     public function __construct(iterable $transports)
     {

diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/PdoCacheAdapterDoctrineSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/PdoCacheAdapterDoctrineSchemaSubscriber.php
@@ -30,7 +30,7 @@ final class PdoCacheAdapterDoctrineSchemaSubscriber implements EventSubscriber
     private $pdoAdapters;
 
     /**
-     * @param iterable<int, PdoAdapter> $pdoAdapters
+     * @param iterable<mixed, PdoAdapter> $pdoAdapters
      */
     public function __construct(iterable $pdoAdapters)
     {

diff --git a/...ymfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php b/...ymfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php
@@ -28,7 +28,7 @@ final class RememberMeTokenProviderDoctrineSchemaSubscriber implements EventSubs
     private $rememberMeHandlers;
 
     /**
-     * @param iterable<int, RememberMeHandlerInterface> $rememberMeHandlers
+     * @param iterable<mixed, RememberMeHandlerInterface> $rememberMeHandlers
      */
     public function __construct(iterable $rememberMeHandlers)
     {

@@ -21,7 +21,7 @@ class ExpressionCacheWarmer implements CacheWarmerInterface
     private $expressionLanguage;
 
     /**
-     * @param iterable<int, Expression> $expressions
+     * @param iterable<mixed, Expression> $expressions
      */
     public function __construct(iterable $expressions, ExpressionLanguage $expressionLanguage)
     {

@@ -42,7 +42,7 @@ class MainConfiguration implements ConfigurationInterface
     private $userProviderFactories;
 
     /**
-     * @param array<int, SecurityFactoryInterface|AuthenticatorFactoryInterface> $factories
+     * @param array<array-key, SecurityFactoryInterface|AuthenticatorFactoryInterface> $factories
      */
     public function __construct(array $factories, array $userProviderFactories)
     {
@@ -220,7 +220,7 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode)
     }
 
     /**
-     * @param array<int, SecurityFactoryInterface|AuthenticatorFactoryInterface> $factories
+     * @param array<array-key, SecurityFactoryInterface|AuthenticatorFactoryInterface> $factories
      */
     private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $factories)
     {

@@ -63,9 +63,9 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
     private $requestMatchers = [];
     private $expressions = [];
     private $contextListeners = [];
-    /** @var array<array{0: int, 1: AuthenticatorFactoryInterface|SecurityFactoryInterface}> */
+    /** @var list<array{int, AuthenticatorFactoryInterface|SecurityFactoryInterface}> */
     private $factories = [];
-    /** @var (AuthenticatorFactoryInterface|SecurityFactoryInterface)[] */
+    /** @var list<AuthenticatorFactoryInterface|SecurityFactoryInterface> */
     private $sortedFactories = [];
     private $userProviderFactories = [];
     private $statelessFirewallKeys = [];

@@ -27,6 +27,9 @@ class FirewallContext
     private $logoutListener;
     private $config;
 
+    /**
+     * @param iterable<mixed, callable> $listeners
+     */
     public function __construct(iterable $listeners, ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null, FirewallConfig $config = null)
     {
         $this->listeners = $listeners;
@@ -40,6 +43,9 @@ public function getConfig()
         return $this->config;
     }
 
+    /**
+     * @return iterable<mixed, callable>
+     */
     public function getListeners(): iterable
     {
         return $this->listeners;

diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
@@ -29,13 +29,13 @@ class ResourceCheckerConfigCache implements ConfigCacheInterface
     private $file;
 
     /**
-     * @var iterable<int, ResourceCheckerInterface>
+     * @var iterable<mixed, ResourceCheckerInterface>
      */
     private $resourceCheckers;
 
     /**
-     * @param string                                  $file             The absolute cache path
-     * @param iterable<int, ResourceCheckerInterface> $resourceCheckers The ResourceCheckers to use for the freshness check
+     * @param string                                    $file             The absolute cache path
+     * @param iterable<mixed, ResourceCheckerInterface> $resourceCheckers The ResourceCheckers to use for the freshness check
      */
     public function __construct(string $file, iterable $resourceCheckers = [])
     {

@@ -23,9 +23,7 @@
  */
 class HelperSet implements \IteratorAggregate
 {
-    /**
-     * @var Helper[]
-     */
+    /** @var array<string, Helper> */
     private $helpers = [];
     private $command;
 

diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -62,7 +62,7 @@ class Crawler implements \Countable, \IteratorAggregate
     private $document;
 
     /**
-     * @var \DOMNode[]
+     * @var list<\DOMNode>
      */
     private $nodes = [];
 

diff --git a/src/Symfony/Component/EventDispatcher/GenericEvent.php b/src/Symfony/Component/EventDispatcher/GenericEvent.php
@@ -172,7 +172,7 @@ public function offsetExists($key)
     /**
      * IteratorAggregate for iterating over the object like an array.
      *
-     * @return \ArrayIterator
+     * @return \ArrayIterator<string, mixed>
      */
     #[\ReturnTypeWillChange]
     public function getIterator()

diff --git a/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php
@@ -16,8 +16,8 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @template TKey
- * @template TValue
+ * @template-covariant TKey
+ * @template-covariant TValue
  *
  * @extends \FilterIterator<TKey, TValue>
  */

@@ -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
      *

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

@@ -14,7 +14,7 @@
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
- * @extends \Traversable<string, self>
+ * @extends \Traversable<string, FormBuilderInterface>
  */
 interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuilderInterface
 {

@@ -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
      */

@@ -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)

@@ -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()

diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -16,15 +16,15 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @implements \IteratorAggregate<string, array<int, string|null>>
+ * @implements \IteratorAggregate<string, list<string|null>>
  */
 class HeaderBag implements \IteratorAggregate, \Countable
 {
     protected const UPPER = '_ABCDEFGHIJKLMNOPQRSTUVWXYZ';
     protected const LOWER = '-abcdefghijklmnopqrstuvwxyz';
 
     /**
-     * @var array<string, array<int, string|null>>
+     * @var array<string, list<string|null>>
      */
     protected $headers = [];
     protected $cacheControl = [];
@@ -255,7 +255,7 @@ public function removeCacheControlDirective(string $key)
     /**
      * Returns an iterator for headers.
      *
-     * @return \ArrayIterator<string, array<int, string|null>>
+     * @return \ArrayIterator<string, list<string|null>>
      */
     #[\ReturnTypeWillChange]
     public function getIterator()

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -58,7 +58,7 @@ class_exists(ConfigCache::class);
 abstract class Kernel implements KernelInterface, RebootableInterface, TerminableInterface
 {
     /**
-     * @var BundleInterface[]
+     * @var array<string, BundleInterface>
      */
     protected $bundles = [];
 

diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/Component/HttpKernel/KernelInterface.php
@@ -31,7 +31,7 @@ interface KernelInterface extends HttpKernelInterface
     /**
      * Returns an array of bundles to register.
      *
-     * @return iterable<BundleInterface>
+     * @return iterable<mixed, BundleInterface>
      */
     public function registerBundles();
 
@@ -55,7 +55,7 @@ public function shutdown();
     /**
      * Gets the registered bundle instances.
      *
-     * @return BundleInterface[]
+     * @return array<string, BundleInterface>
      */
     public function getBundles();
 

diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php
@@ -21,6 +21,7 @@
 class BufferedBundleReader implements BundleReaderInterface
 {
     private $reader;
+    /** @var RingBuffer<string, mixed> */
     private $buffer;
 
     /**