Merge branch '2.8' into 3.3

* 2.8:
  [DI] minor docblock fixes

Author: nicolas-grekas

CacheWarmer/RouterCacheWarmer.php

@@ -24,9 +24,6 @@ class RouterCacheWarmer implements CacheWarmerInterface
 {
     protected $router;
 
-    /**
-     * @param RouterInterface $router A Router instance
-     */
     public function __construct(RouterInterface $router)
     {
         $this->router = $router;

CacheWarmer/TemplatePathsCacheWarmer.php

@@ -25,10 +25,6 @@ class TemplatePathsCacheWarmer extends CacheWarmer
     protected $finder;
     protected $locator;
 
-    /**
-     * @param TemplateFinderInterface $finder  A template finder
-     * @param TemplateLocator         $locator The template locator
-     */
     public function __construct(TemplateFinderInterface $finder, TemplateLocator $locator)
     {
         $this->finder = $finder;

Command/ContainerDebugCommand.php

@@ -149,8 +149,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
     /**
      * Validates input arguments and options.
      *
-     * @param InputInterface $input
-     *
      * @throws \InvalidArgumentException
      */
     protected function validateInput(InputInterface $input)

Console/Application.php

@@ -29,9 +29,6 @@ class Application extends BaseApplication
     private $kernel;
     private $commandsRegistered = false;
 
-    /**
-     * @param KernelInterface $kernel A KernelInterface instance
-     */
     public function __construct(KernelInterface $kernel)
     {
         $this->kernel = $kernel;
@@ -55,9 +52,6 @@ public function getKernel()
     /**
      * Runs the current application.
      *
-     * @param InputInterface  $input  An Input instance
-     * @param OutputInterface $output An Output instance
-     *
      * @return int 0 if everything went fine, or an error code
      */
     public function doRun(InputInterface $input, OutputInterface $output)

Console/Descriptor/Descriptor.php

@@ -102,33 +102,21 @@ protected function write($content, $decorated = false)
 
     /**
      * Describes an InputArgument instance.
-     *
-     * @param RouteCollection $routes
-     * @param array           $options
      */
     abstract protected function describeRouteCollection(RouteCollection $routes, array $options = array());
 
     /**
      * Describes an InputOption instance.
-     *
-     * @param Route $route
-     * @param array $options
      */
     abstract protected function describeRoute(Route $route, array $options = array());
 
     /**
      * Describes container parameters.
-     *
-     * @param ParameterBag $parameters
-     * @param array        $options
      */
     abstract protected function describeContainerParameters(ParameterBag $parameters, array $options = array());
 
     /**
      * Describes container tags.
-     *
-     * @param ContainerBuilder $builder
-     * @param array            $options
      */
     abstract protected function describeContainerTags(ContainerBuilder $builder, array $options = array());
 
@@ -149,34 +137,21 @@ abstract protected function describeContainerService($service, array $options =
      *
      * Common options are:
      * * tag: filters described services by given tag
-     *
-     * @param ContainerBuilder $builder
-     * @param array            $options
      */
     abstract protected function describeContainerServices(ContainerBuilder $builder, array $options = array());
 
     /**
      * Describes a service definition.
-     *
-     * @param Definition $definition
-     * @param array      $options
      */
     abstract protected function describeContainerDefinition(Definition $definition, array $options = array());
 
     /**
      * Describes a service alias.
-     *
-     * @param Alias                 $alias
-     * @param array                 $options
-     * @param ContainerBuilder|null $builder
      */
     abstract protected function describeContainerAlias(Alias $alias, array $options = array(), ContainerBuilder $builder = null);
 
     /**
      * Describes a container parameter.
-     *
-     * @param string $parameter
-     * @param array  $options
      */
     abstract protected function describeContainerParameter($parameter, array $options = array());
 
@@ -185,9 +160,6 @@ abstract protected function describeContainerParameter($parameter, array $option
      *
      * Common options are:
      * * name: name of listened event
-     *
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param array                    $options
      */
     abstract protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = array());
 

Console/Descriptor/JsonDescriptor.php

@@ -180,9 +180,6 @@ protected function describeContainerParameter($parameter, array $options = array
     /**
      * Writes data as json.
      *
-     * @param array $data
-     * @param array $options
-     *
      * @return array|string
      */
     private function writeData(array $data, array $options)
@@ -192,8 +189,6 @@ private function writeData(array $data, array $options)
     }
 
     /**
-     * @param Route $route
-     *
      * @return array
      */
     protected function getRouteData(Route $route)
@@ -277,8 +272,6 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
     }
 
     /**
-     * @param Alias $alias
-     *
      * @return array
      */
     private function getContainerAliasData(Alias $alias)

Console/Descriptor/MarkdownDescriptor.php

@@ -365,8 +365,6 @@ protected function describeCallable($callable, array $options = array())
     }
 
     /**
-     * @param array $array
-     *
      * @return string
      */
     private function formatRouterConfig(array $array)

Console/Descriptor/XmlDescriptor.php

@@ -133,8 +133,6 @@ protected function describeContainerParameter($parameter, array $options = array
     /**
      * Writes DOM document.
      *
-     * @param \DOMDocument $dom
-     *
      * @return \DOMDocument|string
      */
     private function writeDocument(\DOMDocument $dom)
@@ -144,8 +142,6 @@ private function writeDocument(\DOMDocument $dom)
     }
 
     /**
-     * @param RouteCollection $routes
-     *
      * @return \DOMDocument
      */
     private function getRouteCollectionDocument(RouteCollection $routes)
@@ -231,8 +227,6 @@ private function getRouteDocument(Route $route, $name = null)
     }
 
     /**
-     * @param ParameterBag $parameters
-     *
      * @return \DOMDocument
      */
     private function getContainerParametersDocument(ParameterBag $parameters)
@@ -483,9 +477,6 @@ private function getContainerAliasDocument(Alias $alias, $id = null)
     }
 
     /**
-     * @param string $parameter
-     * @param array  $options
-     *
      * @return \DOMDocument
      */
     private function getContainerParameterDocument($parameter, $options = array())

Controller/ControllerNameParser.php

@@ -24,9 +24,6 @@ class ControllerNameParser
 {
     protected $kernel;
 
-    /**
-     * @param KernelInterface $kernel A KernelInterface instance
-     */
     public function __construct(KernelInterface $kernel)
     {
         $this->kernel = $kernel;

Controller/ControllerResolver.php

@@ -23,11 +23,6 @@ class ControllerResolver extends ContainerControllerResolver
 {
     protected $parser;
 
-    /**
-     * @param ContainerInterface   $container A ContainerInterface instance
-     * @param ControllerNameParser $parser    A ControllerNameParser instance
-     * @param LoggerInterface      $logger    A LoggerInterface instance
-     */
     public function __construct(ContainerInterface $container, ControllerNameParser $parser, LoggerInterface $logger = null)
     {
         $this->parser = $parser;