Merge branch '7.4' into 8.0

* 7.4: (21 commits)
  [ObjectMapper] lazy loading
  [Filesystem] Unify logic for isAbsolute() in Path
  [DependencyInjection] Include return type in AppReference shape
  [Finder] Make method calls explicit in ExcludeDirectoryFilterIterator
  [Cache] Remove unset call on undefined variable in PhpArrayAdapter
  [Twig] Ensure WrappedTemplatedEmail::getReturnPath() returns a string
  [Routing] Simplify importing routes defined on controller services
  Fix tests
  [DependendcyInjection] Improve shape for "from_callable" definitions
  [PHPDoc] Fix various PHPDoc syntax errors
  [Console] Add missing VERBOSITY_SILENT case in CommandDataCollector
  [Notifier] Remove unused $transportName argument in EmailChannel::notify()
  [Translation] Remove an unused argument passed to parseNode() method
  [HttpClient] Reject 3xx pushed responses
  [Serializer] Use Asia/Tokyo instead of Japan in tests
  [ProxyManagerBridge] Remove comment that reference github discussion
  [JsonPath] Remove unused "nothing" property from JsonCrawler
  [ErrorHandler] Improve PHPDoc precision in SerializerErrorRenderer
  [Routing] Fix matching the "0" URL
  [Form] Fix EnumType choice_label logic for grouped choices
  ...

Author: nicolas-grekas

Loader/Configurator/AppReference.php

@@ -42,7 +42,7 @@
  *     type?: string|null,
  *     ignore_errors?: bool,
  * }>
- * @psalm-type ParametersConfig = array<string, scalar|\UnitEnum|array<scalar|\UnitEnum|array|null>|null>
+ * @psalm-type ParametersConfig = array<string, scalar|\UnitEnum|array<scalar|\UnitEnum|array<mixed>|null>|null>
  * @psalm-type ArgumentsType = list<mixed>|array<string, mixed>
  * @psalm-type CallType = array<string, ArgumentsType>|array{0:string, 1?:ArgumentsType, 2?:bool}|array{method:string, arguments?:ArgumentsType, returns_clone?:bool}
  * @psalm-type TagsType = list<string|array<string, array<string, mixed>>> // arrays inside the list must have only one element, with the tag name as the key
@@ -94,7 +94,7 @@
  *     autoconfigure?: bool,
  *     bind?: array<string, mixed>,
  *     constructor?: string,
- *     from_callable?: mixed,
+ *     from_callable?: CallbackType,
  * }
  * @psalm-type AliasType = string|array{
  *     alias: string,
@@ -134,21 +134,24 @@
  *     ...<string, DefinitionType|AliasType|PrototypeType|StackType|ArgumentsType|null>
  * }
  * @psalm-type ExtensionType = array<string, mixed>
+ * @psalm-type ConfigType = array{
+ *     imports?: ImportsConfig,
+ *     parameters?: ParametersConfig,
+ *     services?: ServicesConfig,
+ *     ...<string, ExtensionType|array{ // extra keys must follow the when@%env% pattern or match an extension alias
+ *         imports?: ImportsConfig,
+ *         parameters?: ParametersConfig,
+ *         services?: ServicesConfig,
+ *         ...<string, ExtensionType>,
+ *     }>
+ * }
  */
 class AppReference
 {
     /**
-     * @param array{
-     *     imports?: ImportsConfig,
-     *     parameters?: ParametersConfig,
-     *     services?: ServicesConfig,
-     *     ...<string, ExtensionType|array{ // extra keys must follow the when@%env% pattern or match an extension alias
-     *         imports?: ImportsConfig,
-     *         parameters?: ParametersConfig,
-     *         services?: ServicesConfig,
-     *         ...<string, ExtensionType>,
-     *     }>
-     * } $config
+     * @param ConfigType $config
+     *
+     * @psalm-return ConfigType
      */
     public static function config(array $config): array
     {