Merge branch '5.4' into 6.0

* 5.4:
  [DependencyInjection] Improve array phpdoc of `ContainerBuilder`
  Match 5.1 mailer configuration
  [Cache] Make sure PdoAdapter::prune() always returns a bool
  [HttpKernel] Fix broken mock
  [HttpClient] Fix handling timeouts when responses are destructed
  [PropertyInfo] Support for intersection types

Author: nicolas-grekas

ContainerBuilder.php

@@ -54,31 +54,35 @@
 class ContainerBuilder extends Container implements TaggedContainerInterface
 {
     /**
-     * @var ExtensionInterface[]
+     * @var array<string, ExtensionInterface>
      */
     private array $extensions = [];
 
     /**
-     * @var ExtensionInterface[]
+     * @var array<string, ExtensionInterface>
      */
     private array $extensionsByNs = [];
 
     /**
-     * @var Definition[]
+     * @var array<string, Definition>
      */
     private array $definitions = [];
 
     /**
-     * @var Alias[]
+     * @var array<string, Alias>
      */
     private array $aliasDefinitions = [];
 
     /**
-     * @var ResourceInterface[]
+     * @var array<string, ResourceInterface>
      */
     private array $resources = [];
 
+    /**
+     * @var array<string, array<array<string, mixed>>>
+     */
     private array $extensionConfigs = [];
+
     private Compiler $compiler;
     private bool $trackResources;
     private ?InstantiatorInterface $proxyInstantiator = null;
@@ -109,15 +113,24 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      */
     private array $vendors;
 
+    /**
+     * @var array<string, ChildDefinition>
+     */
     private array $autoconfiguredInstanceof = [];
 
     /**
-     * @var callable[]
+     * @var array<string, callable>
      */
     private array $autoconfiguredAttributes = [];
 
+    /**
+     * @var array<string, bool>
+     */
     private array $removedIds = [];
 
+    /**
+     * @var array<int, bool>
+     */
     private array $removedBindingIds = [];
 
     private const INTERNAL_TYPES = [
@@ -143,7 +156,7 @@ public function __construct(ParameterBagInterface $parameterBag = null)
     }
 
     /**
-     * @var \ReflectionClass[] a list of class reflectors
+     * @var array<string, \ReflectionClass>
      */
     private array $classReflectors;
 
@@ -204,7 +217,7 @@ public function getExtension(string $name): ExtensionInterface
     /**
      * Returns all registered extensions.
      *
-     * @return ExtensionInterface[]
+     * @return array<string, ExtensionInterface>
      */
     public function getExtensions(): array
     {
@@ -250,7 +263,7 @@ public function addResource(ResourceInterface $resource): static
     /**
      * Sets the resources for this configuration.
      *
-     * @param ResourceInterface[] $resources An array of resources
+     * @param array<string, ResourceInterface> $resources
      *
      * @return $this
      */
@@ -395,8 +408,8 @@ public function fileExists(string $path, bool|string $trackContents = true): boo
     /**
      * Loads the configuration for an extension.
      *
-     * @param string $extension The extension alias or namespace
-     * @param array  $values    An array of values that customizes the extension
+     * @param string                    $extension The extension alias or namespace
+     * @param array<string, mixed>|null $values    An array of values that customizes the extension
      *
      * @return $this
      *
@@ -409,13 +422,9 @@ public function loadFromExtension(string $extension, array $values = null): stat
             throw new BadMethodCallException('Cannot load from an extension on a compiled container.');
         }
 
-        if (\func_num_args() < 2) {
-            $values = [];
-        }
-
         $namespace = $this->getExtension($extension)->getAlias();
 
-        $this->extensionConfigs[$namespace][] = $values;
+        $this->extensionConfigs[$namespace][] = $values ?? [];
 
         return $this;
     }
@@ -644,6 +653,8 @@ public function merge(self $container)
 
     /**
      * Returns the configuration array for the given extension.
+     *
+     * @return array<array<string, mixed>>
      */
     public function getExtensionConfig(string $name): array
     {
@@ -656,6 +667,8 @@ public function getExtensionConfig(string $name): array
 
     /**
      * Prepends a config array to the configs of the given extension.
+     *
+     * @param array<string, mixed> $config
      */
     public function prependExtensionConfig(string $name, array $config)
     {
@@ -737,6 +750,8 @@ public function getServiceIds(): array
 
     /**
      * Gets removed service or alias ids.
+     *
+     * @return array<string, bool>
      */
     public function getRemovedIds(): array
     {
@@ -745,6 +760,8 @@ public function getRemovedIds(): array
 
     /**
      * Adds the service aliases.
+     *
+     * @param array<string, string|Alias> $aliases
      */
     public function addAliases(array $aliases)
     {
@@ -755,6 +772,8 @@ public function addAliases(array $aliases)
 
     /**
      * Sets the service aliases.
+     *
+     * @param array<string, string|Alias> $aliases
      */
     public function setAliases(array $aliases)
     {
@@ -801,7 +820,7 @@ public function hasAlias(string $id): bool
     }
 
     /**
-     * @return Alias[]
+     * @return array<string, Alias>
      */
     public function getAliases(): array
     {
@@ -845,7 +864,7 @@ public function autowire(string $id, string $class = null): Definition
     /**
      * Adds the service definitions.
      *
-     * @param Definition[] $definitions An array of service definitions
+     * @param array<string, Definition> $definitions
      */
     public function addDefinitions(array $definitions)
     {
@@ -857,7 +876,7 @@ public function addDefinitions(array $definitions)
     /**
      * Sets the service definitions.
      *
-     * @param Definition[] $definitions An array of service definitions
+     * @param array<string, Definition> $definitions
      */
     public function setDefinitions(array $definitions)
     {
@@ -868,7 +887,7 @@ public function setDefinitions(array $definitions)
     /**
      * Gets all service definitions.
      *
-     * @return Definition[]
+     * @return array<string, Definition>
      */
     public function getDefinitions(): array
     {
@@ -1165,7 +1184,7 @@ private function doResolveServices(mixed $value, array &$inlineServices = [], bo
      *         }
      *     }
      *
-     * @return array An array of tags with the tagged service as key, holding a list of attribute arrays
+     * @return array<string, array> An array of tags with the tagged service as key, holding a list of attribute arrays
      */
     public function findTaggedServiceIds(string $name, bool $throwOnAbstract = false): array
     {
@@ -1185,6 +1204,8 @@ public function findTaggedServiceIds(string $name, bool $throwOnAbstract = false
 
     /**
      * Returns all tags the defined services use.
+     *
+     * @return string[]
      */
     public function findTags(): array
     {
@@ -1271,15 +1292,15 @@ public function registerAliasForArgument(string $id, string $type, string $name
     /**
      * Returns an array of ChildDefinition[] keyed by interface.
      *
-     * @return ChildDefinition[]
+     * @return array<string, ChildDefinition>
      */
     public function getAutoconfiguredInstanceof(): array
     {
         return $this->autoconfiguredInstanceof;
     }
 
     /**
-     * @return callable[]
+     * @return array<string, callable>
      */
     public function getAutoconfiguredAttributes(): array
     {
@@ -1419,6 +1440,8 @@ final public static function willBeAvailable(string $package, string $class, arr
     /**
      * Gets removed binding ids.
      *
+     * @return array<int, bool>
+     *
      * @internal
      */
     public function getRemovedBindingIds(): array
@@ -1442,6 +1465,8 @@ public function removeBindings(string $id)
     }
 
     /**
+     * @return string[]
+     *
      * @internal
      */
     public static function getServiceConditionals(mixed $value): array
@@ -1460,6 +1485,8 @@ public static function getServiceConditionals(mixed $value): array
     }
 
     /**
+     * @return string[]
+     *
      * @internal
      */
     public static function getInitializedConditionals(mixed $value): array

Tests/Loader/YamlFileLoaderTest.php

@@ -347,7 +347,7 @@ public function testExtensionWithNullConfig()
         $loader->load('null_config.yml');
         $container->compile();
 
-        $this->assertSame([null], $container->getParameter('project.configs'));
+        $this->assertSame([[]], $container->getParameter('project.configs'));
     }
 
     public function testSupports()