Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit d77ec7dda0c2 · 2025-11-05T15:36:47.000+01:00
* 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
  ...
diff --git a/ErrorRenderer/SerializerErrorRenderer.php b/ErrorRenderer/SerializerErrorRenderer.php
@@ -29,9 +29,9 @@ class SerializerErrorRenderer implements ErrorRendererInterface
     private bool|\Closure $debug;
 
     /**
-     * @param string|callable(FlattenException) $format The format as a string or a callable that should return it
-     *                                                  formats not supported by Request::getMimeTypes() should be given as mime types
-     * @param bool|callable                     $debug  The debugging mode as a boolean or a callable that should return it
+     * @param string|callable(FlattenException): string $format The format as a string or a callable that should return it
+     *                                                          formats not supported by Request::getMimeTypes() should be given as mime types
+     * @param bool|callable                             $debug  The debugging mode as a boolean or a callable that should return it
      */
     public function __construct(
         private SerializerInterface $serializer,
