Merge branch '5.4' into 6.0

* 5.4:
  [Serializer] cs fix
  Cleanup more `@return` annotations
  [Form] Fix phpdoc on FormBuilderInterface

Author: nicolas-grekas

Bundle/Bundle.php

@@ -58,8 +58,6 @@ public function build(ContainerBuilder $container)
     /**
      * Returns the bundle's container extension.
      *
-     * @return ExtensionInterface|null The container extension
-     *
      * @throws \LogicException
      */
     public function getContainerExtension(): ?ExtensionInterface

Bundle/BundleInterface.php

@@ -41,31 +41,23 @@ public function build(ContainerBuilder $container);
 
     /**
      * Returns the container extension that should be implicitly loaded.
-     *
-     * @return ExtensionInterface|null The default extension or null if there is none
      */
     public function getContainerExtension(): ?ExtensionInterface;
 
     /**
      * Returns the bundle name (the class short name).
-     *
-     * @return string The Bundle name
      */
     public function getName(): string;
 
     /**
      * Gets the Bundle namespace.
-     *
-     * @return string The Bundle namespace
      */
     public function getNamespace(): string;
 
     /**
      * Gets the Bundle directory path.
      *
      * The path should always be returned as a Unix path (with /).
-     *
-     * @return string The Bundle absolute path
      */
     public function getPath(): string;
 }

CacheWarmer/CacheWarmerInterface.php

@@ -26,7 +26,7 @@ interface CacheWarmerInterface extends WarmableInterface
      * A warmer should return true if the cache can be
      * generated incrementally and on-demand.
      *
-     * @return bool true if the warmer is optional, false otherwise
+     * @return bool
      */
     public function isOptional();
 }

Controller/ArgumentResolverInterface.php

@@ -24,8 +24,6 @@ interface ArgumentResolverInterface
     /**
      * Returns the arguments to pass to the controller.
      *
-     * @return array An array of arguments to pass to the controller
-     *
      * @throws \RuntimeException When no value could be provided for a required argument
      */
     public function getArguments(Request $request, callable $controller): array;

Controller/ControllerResolver.php

@@ -91,8 +91,6 @@ public function getController(Request $request): callable|false
     /**
      * Returns a callable for the given controller.
      *
-     * @return callable A PHP callable
-     *
      * @throws \InvalidArgumentException When the controller cannot be created
      */
     protected function createController(string $controller): callable

DataCollector/DataCollectorInterface.php

@@ -30,7 +30,7 @@ public function collect(Request $request, Response $response, \Throwable $except
     /**
      * Returns the name of the collector.
      *
-     * @return string The collector name
+     * @return string
      */
     public function getName();
 }

DataCollector/RouterDataCollector.php

@@ -82,17 +82,11 @@ public function getRedirect(): bool
         return $this->data['redirect'];
     }
 
-    /**
-     * @return string|null The target URL
-     */
     public function getTargetUrl(): ?string
     {
         return $this->data['url'];
     }
 
-    /**
-     * @return string|null The target route
-     */
     public function getTargetRoute(): ?string
     {
         return $this->data['route'];

DependencyInjection/Extension.php

@@ -24,8 +24,6 @@ abstract class Extension extends BaseExtension
 
     /**
      * Gets the annotated classes to cache.
-     *
-     * @return array An array of classes
      */
     public function getAnnotatedClassesToCompile(): array
     {

Event/RequestEvent.php

@@ -46,8 +46,6 @@ public function setResponse(Response $response)
 
     /**
      * Returns whether a response was set.
-     *
-     * @return bool Whether a response was set
      */
     public function hasResponse(): bool
     {

Exception/HttpExceptionInterface.php

@@ -20,15 +20,11 @@ interface HttpExceptionInterface extends \Throwable
 {
     /**
      * Returns the status code.
-     *
-     * @return int An HTTP response status code
      */
     public function getStatusCode(): int;
 
     /**
      * Returns response headers.
-     *
-     * @return array Response headers
      */
     public function getHeaders(): array;
 }