Merge branch '3.4' into 4.3

* 3.4:
  Remove superfluous phpdoc tags

Author: nicolas-grekas

CacheWarmer/AbstractPhpFileCacheWarmer.php

@@ -81,8 +81,7 @@ final protected function ignoreAutoloadException($class, \Exception $exception)
     }
 
     /**
-     * @param string       $cacheDir
-     * @param ArrayAdapter $arrayAdapter
+     * @param string $cacheDir
      *
      * @return bool false if there is nothing to warm-up
      */

Console/Descriptor/Descriptor.php

@@ -132,8 +132,6 @@ abstract protected function describeContainerTags(ContainerBuilder $builder, arr
      * * name: name of described service
      *
      * @param Definition|Alias|object $service
-     * @param array                   $options
-     * @param ContainerBuilder|null   $builder
      */
     abstract protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null);
 
@@ -177,7 +175,6 @@ abstract protected function describeEventDispatcherListeners(EventDispatcherInte
      * Describes a callable.
      *
      * @param callable $callable
-     * @param array    $options
      */
     abstract protected function describeCallable($callable, array $options = []);
 
@@ -224,8 +221,7 @@ protected function formatParameter($value)
     }
 
     /**
-     * @param ContainerBuilder $builder
-     * @param string           $serviceId
+     * @param string $serviceId
      *
      * @return mixed
      */
@@ -249,8 +245,7 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
     }
 
     /**
-     * @param ContainerBuilder $builder
-     * @param bool             $showHidden
+     * @param bool $showHidden
      *
      * @return array
      */

Kernel/MicroKernelTrait.php

@@ -29,8 +29,6 @@ trait MicroKernelTrait
      *
      *     $routes->import('config/routing.yml');
      *     $routes->add('/admin', 'App\Controller\AdminController::dashboard', 'admin_dashboard');
-     *
-     * @param RouteCollectionBuilder $routes
      */
     abstract protected function configureRoutes(RouteCollectionBuilder $routes);
 
@@ -50,9 +48,6 @@ abstract protected function configureRoutes(RouteCollectionBuilder $routes);
      * Or parameters:
      *
      *     $c->setParameter('halloween', 'lot of fun');
-     *
-     * @param ContainerBuilder $c
-     * @param LoaderInterface  $loader
      */
     abstract protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader);
 

Routing/Router.php

@@ -41,7 +41,6 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI
      * @param array                   $options    An array of options
      * @param RequestContext          $context    The context
      * @param ContainerInterface|null $parameters A ContainerInterface instance allowing to fetch parameters
-     * @param LoggerInterface|null    $logger
      */
     public function __construct(ContainerInterface $container, $resource, array $options = [], RequestContext $context = null, ContainerInterface $parameters = null, LoggerInterface $logger = null, string $defaultLocale = null)
     {

Translation/Translator.php

@@ -65,12 +65,6 @@ class Translator extends BaseTranslator implements WarmableInterface
      *   * debug:     Whether to enable debugging or not (false by default)
      *   * resource_files: List of translation resources available grouped by locale.
      *
-     * @param ContainerInterface        $container     A ContainerInterface instance
-     * @param MessageFormatterInterface $formatter     The message formatter
-     * @param string                    $defaultLocale
-     * @param array                     $loaderIds     An array of loader Ids
-     * @param array                     $options       An array of options
-     *
      * @throws InvalidArgumentException
      */
     public function __construct(ContainerInterface $container, MessageFormatterInterface $formatter, string $defaultLocale, array $loaderIds = [], array $options = [])