[HttpKernel] Backport type declaration fixes

Signed-off-by: Alexander M. Turek <me@derrabus.de>

Author: derrabus

CacheClearer/ChainCacheClearer.php

@@ -22,6 +22,9 @@ class ChainCacheClearer implements CacheClearerInterface
 {
     private $clearers;
 
+    /**
+     * @param iterable<mixed, CacheClearerInterface> $clearers
+     */
     public function __construct(iterable $clearers = [])
     {
         $this->clearers = $clearers;

CacheClearer/Psr6CacheClearer.php

@@ -11,23 +11,36 @@
 
 namespace Symfony\Component\HttpKernel\CacheClearer;
 
+use Psr\Cache\CacheItemPoolInterface;
+
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
 class Psr6CacheClearer implements CacheClearerInterface
 {
     private $pools = [];
 
+    /**
+     * @param array<string, CacheItemPoolInterface> $pools
+     */
     public function __construct(array $pools = [])
     {
         $this->pools = $pools;
     }
 
+    /**
+     * @return bool
+     */
     public function hasPool(string $name)
     {
         return isset($this->pools[$name]);
     }
 
+    /**
+     * @return CacheItemPoolInterface
+     *
+     * @throws \InvalidArgumentException If the cache pool with the given name does not exist
+     */
     public function getPool(string $name)
     {
         if (!$this->hasPool($name)) {
@@ -37,6 +50,11 @@ public function getPool(string $name)
         return $this->pools[$name];
     }
 
+    /**
+     * @return bool
+     *
+     * @throws \InvalidArgumentException If the cache pool with the given name does not exist
+     */
     public function clearPool(string $name)
     {
         if (!isset($this->pools[$name])) {

CacheWarmer/CacheWarmerAggregate.php

@@ -26,6 +26,9 @@ class CacheWarmerAggregate implements CacheWarmerInterface
     private $optionalsEnabled = false;
     private $onlyOptionalsEnabled = false;
 
+    /**
+     * @param iterable<mixed, CacheWarmerInterface> $warmers
+     */
     public function __construct(iterable $warmers = [], bool $debug = false, string $deprecationLogsFilepath = null)
     {
         $this->warmers = $warmers;

Controller/ArgumentResolver.php

@@ -28,12 +28,11 @@
 final class ArgumentResolver implements ArgumentResolverInterface
 {
     private $argumentMetadataFactory;
+    private $argumentValueResolvers;
 
     /**
-     * @var iterable|ArgumentValueResolverInterface[]
+     * @param iterable<mixed, ArgumentValueResolverInterface> $argumentValueResolvers
      */
-    private $argumentValueResolvers;
-
     public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, iterable $argumentValueResolvers = [])
     {
         $this->argumentMetadataFactory = $argumentMetadataFactory ?? new ArgumentMetadataFactory();
@@ -83,6 +82,9 @@ public function getArguments(Request $request, callable $controller): array
         return $arguments;
     }
 
+    /**
+     * @return iterable<int, ArgumentValueResolverInterface>
+     */
     public static function getDefaultArgumentValueResolvers(): iterable
     {
         return [

DependencyInjection/LazyLoadingFragmentHandler.php

@@ -23,6 +23,10 @@
 class LazyLoadingFragmentHandler extends FragmentHandler
 {
     private $container;
+
+    /**
+     * @var array<string, bool>
+     */
     private $initialized = [];
 
     public function __construct(ContainerInterface $container, RequestStack $requestStack, bool $debug = false)

DependencyInjection/MergeExtensionConfigurationPass.php

@@ -23,6 +23,9 @@ class MergeExtensionConfigurationPass extends BaseMergeExtensionConfigurationPas
 {
     private $extensions;
 
+    /**
+     * @param string[] $extensions
+     */
     public function __construct(array $extensions)
     {
         $this->extensions = $extensions;

DependencyInjection/ServicesResetter.php

@@ -26,6 +26,10 @@ class ServicesResetter implements ResetInterface
     private $resettableServices;
     private $resetMethods;
 
+    /**
+     * @param \Traversable<string, object>   $resettableServices
+     * @param array<string, string|string[]> $resetMethods
+     */
     public function __construct(\Traversable $resettableServices, array $resetMethods)
     {
         $this->resettableServices = $resettableServices;

EventListener/DebugHandlersListener.php

@@ -43,11 +43,11 @@ class DebugHandlersListener implements EventSubscriberInterface
     private $hasTerminatedWithException;
 
     /**
-     * @param callable|null $exceptionHandler A handler that must support \Throwable instances that will be called on Exception
-     * @param array|int     $levels           An array map of E_* to LogLevel::* or an integer bit field of E_* constants
-     * @param int|null      $throwAt          Thrown errors in a bit field of E_* constants, or null to keep the current value
-     * @param bool          $scream           Enables/disables screaming mode, where even silenced errors are logged
-     * @param bool          $scope            Enables/disables scoping mode
+     * @param callable|null  $exceptionHandler A handler that must support \Throwable instances that will be called on Exception
+     * @param array|int|null $levels           An array map of E_* to LogLevel::* or an integer bit field of E_* constants
+     * @param int|null       $throwAt          Thrown errors in a bit field of E_* constants, or null to keep the current value
+     * @param bool           $scream           Enables/disables screaming mode, where even silenced errors are logged
+     * @param bool           $scope            Enables/disables scoping mode
      */
     public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = \E_ALL, ?int $throwAt = \E_ALL, bool $scream = true, $scope = true, $deprecationLogger = null, $fileLinkFormat = null)
     {

EventListener/RouterListener.php

@@ -50,9 +50,8 @@ class RouterListener implements EventSubscriberInterface
     private $debug;
 
     /**
-     * @param UrlMatcherInterface|RequestMatcherInterface $matcher    The Url or Request matcher
-     * @param RequestContext|null                         $context    The RequestContext (can be null when $matcher implements RequestContextAwareInterface)
-     * @param string                                      $projectDir
+     * @param UrlMatcherInterface|RequestMatcherInterface $matcher The Url or Request matcher
+     * @param RequestContext|null                         $context The RequestContext (can be null when $matcher implements RequestContextAwareInterface)
      *
      * @throws \InvalidArgumentException
      */
@@ -67,7 +66,7 @@ public function __construct($matcher, RequestStack $requestStack, RequestContext
         }
 
         $this->matcher = $matcher;
-        $this->context = $context ?: $matcher->getContext();
+        $this->context = $context ?? $matcher->getContext();
         $this->requestStack = $requestStack;
         $this->logger = $logger;
         $this->projectDir = $projectDir;

HttpKernel.php

@@ -60,11 +60,7 @@ public function __construct(EventDispatcherInterface $dispatcher, ControllerReso
         $this->dispatcher = $dispatcher;
         $this->resolver = $resolver;
         $this->requestStack = $requestStack ?? new RequestStack();
-        $this->argumentResolver = $argumentResolver;
-
-        if (null === $this->argumentResolver) {
-            $this->argumentResolver = new ArgumentResolver();
-        }
+        $this->argumentResolver = $argumentResolver ?? new ArgumentResolver();
     }
 
     /**