minor #24663 [DI] minor docblock fixes (nicolas-grekas)

This PR was merged into the 2.7 branch.

Discussion
----------

[DI] minor docblock fixes

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

As found in #24611

Commits
-------

0c9edaf [DI] minor docblock fixes

src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php

@@ -26,9 +26,6 @@ class ProxyCacheWarmer implements CacheWarmerInterface
 {
     private $registry;
 
-    /**
-     * @param ManagerRegistry $registry A ManagerRegistry instance
-     */
     public function __construct(ManagerRegistry $registry)
     {
         $this->registry = $registry;

src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

@@ -26,8 +26,6 @@ class ContainerAwareEventManager extends EventManager
      * Map of registered listeners.
      *
      * <event> => <listeners>
-     *
-     * @var array
      */
     private $listeners = array();
     private $initialized = array();

src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php

@@ -25,14 +25,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class ContainerAwareLoader extends Loader
 {
-    /**
-     * @var ContainerInterface
-     */
     private $container;
 
-    /**
-     * @param ContainerInterface $container A ContainerInterface instance
-     */
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;

src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

@@ -27,15 +27,11 @@ abstract class AbstractDoctrineExtension extends Extension
 {
     /**
      * Used inside metadata driver method to simplify aggregation of data.
-     *
-     * @var array
      */
     protected $aliasMap = array();
 
     /**
      * Used inside metadata driver method to simplify aggregation of data.
-     *
-     * @var array
      */
     protected $drivers = array();
 
@@ -142,10 +138,6 @@ abstract class AbstractDoctrineExtension extends Extension
      *
      * Returns false when autodetection failed, an array of the completed information otherwise.
      *
-     * @param array            $bundleConfig
-     * @param \ReflectionClass $bundle
-     * @param ContainerBuilder $container    A ContainerBuilder instance
-     *
      * @return array|false
      */
     protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container)
@@ -402,9 +394,6 @@ abstract class AbstractDoctrineExtension extends Extension
      *
      * The manager called $autoMappedManager will map all bundles that are not mapped by other managers.
      *
-     * @param array $managerConfigs
-     * @param array $bundles
-     *
      * @return array The modified version of $managerConfigs
      */
     protected function fixManagersAutoMappings(array $managerConfigs, array $bundles)
@@ -464,8 +453,6 @@ abstract class AbstractDoctrineExtension extends Extension
     /**
      * Search for a manager that is declared as 'auto_mapping' = true.
      *
-     * @param array $managerConfigs
-     *
      * @return null|string The name of the manager. If no one manager is found, returns null
      *
      * @throws \LogicException

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

@@ -134,8 +134,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
 
     /**
      * Register mappings and alias with the metadata drivers.
-     *
-     * @param ContainerBuilder $container
      */
     public function process(ContainerBuilder $container)
     {
@@ -167,8 +165,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      * Get the service name of the metadata chain driver that the mappings
      * should be registered with.
      *
-     * @param ContainerBuilder $container
-     *
      * @return string The name of the chain driver service
      *
      * @throws ParameterNotFoundException if non of the managerParameters has a
@@ -195,8 +191,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
     /**
      * Get the service name from the pattern and the configured manager name.
      *
-     * @param ContainerBuilder $container
-     *
      * @return string a service definition name
      *
      * @throws ParameterNotFoundException if none of the managerParameters has a
@@ -213,8 +207,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      * The default implementation loops over the managerParameters and returns
      * the first non-empty parameter.
      *
-     * @param ContainerBuilder $container
-     *
      * @return string The name of the active manager
      *
      * @throws ParameterNotFoundException if none of the managerParameters is found in the container
@@ -240,8 +232,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      * This default implementation checks if the class has the enabledParameter
      * configured and if so if that parameter is present in the container.
      *
-     * @param ContainerBuilder $container
-     *
      * @return bool whether this compiler pass really should register the mappings
      */
     protected function enabled(ContainerBuilder $container)

src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php

@@ -214,8 +214,6 @@ class EntityChoiceList extends ObjectChoiceList
     /**
      * Returns the entities corresponding to the given values.
      *
-     * @param array $values
-     *
      * @return array
      *
      * @see ChoiceListInterface
@@ -267,8 +265,6 @@ class EntityChoiceList extends ObjectChoiceList
     /**
      * Returns the values corresponding to the given entities.
      *
-     * @param array $entities
-     *
      * @return array
      *
      * @see ChoiceListInterface

src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php

@@ -24,8 +24,6 @@ class CollectionToArrayTransformer implements DataTransformerInterface
     /**
      * Transforms a collection into an array.
      *
-     * @param Collection $collection A collection of entities
-     *
      * @return mixed An array of entities
      *
      * @throws TransformationFailedException

src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php

@@ -84,8 +84,6 @@ class EntityType extends DoctrineType
     /**
      * Converts a query parameter to an array.
      *
-     * @param Parameter $parameter The query parameter
-     *
      * @return array The array representation of the parameter
      */
     private function parameterToArray(Parameter $parameter)

src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php

@@ -26,10 +26,6 @@ class DbalLogger implements SQLLogger
     protected $logger;
     protected $stopwatch;
 
-    /**
-     * @param LoggerInterface $logger    A LoggerInterface instance
-     * @param Stopwatch       $stopwatch A Stopwatch instance
-     */
     public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch = null)
     {
         $this->logger = $logger;

src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php

@@ -45,11 +45,6 @@ class DoctrineTokenProvider implements TokenProviderInterface
      */
     private $conn;
 
-    /**
-     * new DoctrineTokenProvider for the RememberMe authentication service.
-     *
-     * @param Connection $conn
-     */
     public function __construct(Connection $conn)
     {
         $this->conn = $conn;

src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -267,8 +267,6 @@ class DoctrineExtensionTest extends TestCase
     }
 
     /**
-     * @param array $data
-     *
      * @return \Symfony\Component\DependencyInjection\ContainerBuilder
      */
     protected function createContainer(array $data = array())

src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php

@@ -22,9 +22,6 @@ use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
  */
 class ChromePhpHandler extends BaseChromePhpHandler
 {
-    /**
-     * @var array
-     */
     private $headers = array();
 
     /**

src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php

@@ -40,14 +40,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
  */
 class ConsoleHandler extends AbstractProcessingHandler implements EventSubscriberInterface
 {
-    /**
-     * @var OutputInterface|null
-     */
     private $output;
-
-    /**
-     * @var array
-     */
     private $verbosityLevelMap = array(
         OutputInterface::VERBOSITY_NORMAL => Logger::WARNING,
         OutputInterface::VERBOSITY_VERBOSE => Logger::NOTICE,
@@ -92,8 +85,6 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe
 
     /**
      * Sets the console output to use for printing logs.
-     *
-     * @param OutputInterface $output The console output to use
      */
     public function setOutput(OutputInterface $output)
     {
@@ -113,8 +104,6 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe
     /**
      * Before a command is executed, the handler gets activated and the console output
      * is set in order to know where to write the logs.
-     *
-     * @param ConsoleCommandEvent $event
      */
     public function onCommand(ConsoleCommandEvent $event)
     {
@@ -128,8 +117,6 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe
 
     /**
      * After a command has been executed, it disables the output.
-     *
-     * @param ConsoleTerminateEvent $event
      */
     public function onTerminate(ConsoleTerminateEvent $event)
     {

src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php

@@ -22,9 +22,6 @@ use Symfony\Component\HttpFoundation\Response;
  */
 class FirePHPHandler extends BaseFirePHPHandler
 {
-    /**
-     * @var array
-     */
     private $headers = array();
 
     /**

src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php

@@ -26,9 +26,6 @@ class SwiftMailerHandler extends BaseSwiftMailerHandler
 
     protected $instantFlush = false;
 
-    /**
-     * @param \Swift_Transport $transport
-     */
     public function setTransport(\Swift_Transport $transport)
     {
         $this->transport = $transport;
@@ -36,8 +33,6 @@ class SwiftMailerHandler extends BaseSwiftMailerHandler
 
     /**
      * After the kernel has been terminated we will always flush messages.
-     *
-     * @param PostResponseEvent $event
      */
     public function onKernelTerminate(PostResponseEvent $event)
     {
@@ -46,8 +41,6 @@ class SwiftMailerHandler extends BaseSwiftMailerHandler
 
     /**
      * After the CLI application has been terminated we will always flush messages.
-     *
-     * @param ConsoleTerminateEvent $event
      */
     public function onCliTerminate(ConsoleTerminateEvent $event)
     {

src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php

@@ -110,8 +110,6 @@ EOF;
     /**
      * Produces the proxy class name for the given definition.
      *
-     * @param Definition $definition
-     *
      * @return string
      */
     private function getProxyClassName(Definition $definition)
@@ -120,8 +118,6 @@ EOF;
     }
 
     /**
-     * @param Definition $definition
-     *
      * @return ClassGenerator
      */
     private function generateProxyClass(Definition $definition)

src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php

@@ -25,9 +25,6 @@ class HttpKernelExtension extends AbstractExtension
 {
     private $handler;
 
-    /**
-     * @param FragmentHandler $handler A FragmentHandler instance
-     */
     public function __construct(FragmentHandler $handler)
     {
         $this->handler = $handler;

src/Symfony/Bridge/Twig/NodeVisitor/Scope.php

@@ -16,24 +16,10 @@ namespace Symfony\Bridge\Twig\NodeVisitor;
  */
 class Scope
 {
-    /**
-     * @var Scope|null
-     */
     private $parent;
-
-    /**
-     * @var array
-     */
     private $data = array();
-
-    /**
-     * @var bool
-     */
     private $left = false;
 
-    /**
-     * @param Scope $parent
-     */
     public function __construct(Scope $parent = null)
     {
         $this->parent = $parent;

src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php

@@ -123,8 +123,6 @@ class TranslationNodeVisitor extends AbstractNodeVisitor
     }
 
     /**
-     * @param Node $node
-     *
      * @return string|null
      */
     private function getReadDomainFromNode(Node $node)

src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php

@@ -27,8 +27,6 @@ class FormThemeTokenParser extends AbstractTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token
-     *
      * @return Node
      */
     public function parse(Token $token)

src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php

@@ -29,8 +29,6 @@ class TransChoiceTokenParser extends TransTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token
-     *
      * @return Node
      *
      * @throws SyntaxError

src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php

@@ -26,8 +26,6 @@ class TransDefaultDomainTokenParser extends AbstractTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token
-     *
      * @return Node
      */
     public function parse(Token $token)

src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php

@@ -30,8 +30,6 @@ class TransTokenParser extends AbstractTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token
-     *
      * @return Node
      *
      * @throws SyntaxError

src/Symfony/Bundle/FrameworkBundle/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;

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php

@@ -24,10 +24,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;

src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php

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

src/Symfony/Bundle/FrameworkBundle/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;
@@ -57,9 +54,6 @@ class Application extends BaseApplication
     /**
      * 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)

src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php

@@ -120,33 +120,21 @@ abstract class Descriptor implements DescriptorInterface
 
     /**
      * 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());
 
@@ -166,33 +154,21 @@ abstract class Descriptor implements DescriptorInterface
      *
      * 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
      */
     abstract protected function describeContainerAlias(Alias $alias, array $options = array());
 
     /**
      * Describes a container parameter.
-     *
-     * @param string $parameter
-     * @param array  $options
      */
     abstract protected function describeContainerParameter($parameter, array $options = array());
 
@@ -201,9 +177,6 @@ abstract class Descriptor implements DescriptorInterface
      *
      * Common options are:
      * * name: name of listened event
-     *
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param array                    $options
      */
     abstract protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = array());
 

src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php

@@ -163,9 +163,6 @@ class JsonDescriptor extends Descriptor
     /**
      * Writes data as json.
      *
-     * @param array $data
-     * @param array $options
-     *
      * @return array|string
      */
     private function writeData(array $data, array $options)
@@ -180,8 +177,6 @@ class JsonDescriptor extends Descriptor
     }
 
     /**
-     * @param Route $route
-     *
      * @return array
      */
     protected function getRouteData(Route $route)
@@ -268,8 +263,6 @@ class JsonDescriptor extends Descriptor
     }
 
     /**
-     * @param Alias $alias
-     *
      * @return array
      */
     private function getContainerAliasData(Alias $alias)

src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php

@@ -351,8 +351,6 @@ class MarkdownDescriptor extends Descriptor
     }
 
     /**
-     * @param array $array
-     *
      * @return string
      */
     private function formatRouterConfig(array $array)

src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php

@@ -375,8 +375,6 @@ class TextDescriptor extends Descriptor
     }
 
     /**
-     * @param array $array
-     *
      * @return string
      */
     private function formatRouterConfig(array $array)

src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php

@@ -122,8 +122,6 @@ class XmlDescriptor extends Descriptor
     /**
      * Writes DOM document.
      *
-     * @param \DOMDocument $dom
-     *
      * @return \DOMDocument|string
      */
     private function writeDocument(\DOMDocument $dom)
@@ -133,8 +131,6 @@ class XmlDescriptor extends Descriptor
     }
 
     /**
-     * @param RouteCollection $routes
-     *
      * @return \DOMDocument
      */
     private function getRouteCollectionDocument(RouteCollection $routes)
@@ -220,8 +216,6 @@ class XmlDescriptor extends Descriptor
     }
 
     /**
-     * @param ParameterBag $parameters
-     *
      * @return \DOMDocument
      */
     private function getContainerParametersDocument(ParameterBag $parameters)
@@ -416,9 +410,6 @@ class XmlDescriptor extends Descriptor
     }
 
     /**
-     * @param string $parameter
-     * @param array  $options
-     *
      * @return \DOMDocument
      */
     private function getContainerParameterDocument($parameter, $options = array())

src/Symfony/Bundle/FrameworkBundle/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;

src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php

@@ -24,11 +24,6 @@ class ControllerResolver extends BaseControllerResolver
     protected $container;
     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->container = $container;

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -45,9 +45,6 @@ class FrameworkExtension extends Extension
     /**
      * Responds to the app.config configuration parameter.
      *
-     * @param array            $configs
-     * @param ContainerBuilder $container
-     *
      * @throws LogicException
      */
     public function load(array $configs, ContainerBuilder $container)
@@ -194,16 +191,7 @@ class FrameworkExtension extends Extension
         return new Configuration($container->getParameter('kernel.debug'));
     }
 
-    /**
+    private function registerFormConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
-     * Loads Form configuration.
-     *
-     * @param array            $config    A configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     *
-     * @throws \LogicException
-     */
-    private function registerFormConfiguration($config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         $loader->load('form.xml');
         if (null === $config['form']['csrf_protection']['enabled']) {
@@ -225,13 +213,6 @@ class FrameworkExtension extends Extension
         }
     }
 
-    /**
-     * Loads the ESI configuration.
-     *
-     * @param array            $config    An ESI configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     */
     private function registerEsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
@@ -241,13 +222,6 @@ class FrameworkExtension extends Extension
         $loader->load('esi.xml');
     }
 
-    /**
-     * Loads the SSI configuration.
-     *
-     * @param array            $config    An SSI configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     */
     private function registerSsiConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
@@ -257,13 +231,6 @@ class FrameworkExtension extends Extension
         $loader->load('ssi.xml');
     }
 
-    /**
-     * Loads the fragments configuration.
-     *
-     * @param array            $config    A fragments configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     */
     private function registerFragmentsConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
@@ -274,15 +241,6 @@ class FrameworkExtension extends Extension
         $container->setParameter('fragment.path', $config['path']);
     }
 
-    /**
-     * Loads the profiler configuration.
-     *
-     * @param array            $config    A profiler configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     *
-     * @throws \LogicException
-     */
     private function registerProfilerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
@@ -355,13 +313,6 @@ class FrameworkExtension extends Extension
         }
     }
 
-    /**
-     * Loads the router configuration.
-     *
-     * @param array            $config    A router configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     */
     private function registerRouterConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         $loader->load('routing.xml');
@@ -388,13 +339,6 @@ class FrameworkExtension extends Extension
         ));
     }
 
-    /**
-     * Loads the session configuration.
-     *
-     * @param array            $config    A session configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     */
     private function registerSessionConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         $loader->load('session.xml');
@@ -447,13 +391,6 @@ class FrameworkExtension extends Extension
         $container->setParameter('session.metadata.update_threshold', $config['metadata_update_threshold']);
     }
 
-    /**
-     * Loads the request configuration.
-     *
-     * @param array            $config    A request configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     */
     private function registerRequestConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if ($config['formats']) {
@@ -465,14 +402,6 @@ class FrameworkExtension extends Extension
         }
     }
 
-    /**
-     * Loads the templating configuration.
-     *
-     * @param array            $config    A templating configuration array
-     * @param string           $ide
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     */
     private function registerTemplatingConfiguration(array $config, $ide, ContainerBuilder $container, XmlFileLoader $loader)
     {
         $loader->load('templating.xml');
@@ -575,13 +504,6 @@ class FrameworkExtension extends Extension
         }
     }
 
-    /**
-     * Loads the assets configuration.
-     *
-     * @param array            $config    A assets configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     */
     private function registerAssetsConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         $loader->load('assets.xml');
@@ -645,12 +567,6 @@ class FrameworkExtension extends Extension
         return new Reference('assets._version_'.$name);
     }
 
-    /**
-     * Loads the translator configuration.
-     *
-     * @param array            $config    A translator configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     */
     private function registerTranslatorConfiguration(array $config, ContainerBuilder $container)
     {
         if (!$this->isConfigEnabled($container, $config)) {
@@ -728,13 +644,6 @@ class FrameworkExtension extends Extension
         }
     }
 
-    /**
-     * Loads the validator configuration.
-     *
-     * @param array            $config    A validation configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     */
     private function registerValidationConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
@@ -861,15 +770,6 @@ class FrameworkExtension extends Extension
         ;
     }
 
-    /**
-     * Loads the security configuration.
-     *
-     * @param array            $config    A CSRF configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     *
-     * @throws \LogicException
-     */
     private function registerSecurityCsrfConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
@@ -884,13 +784,6 @@ class FrameworkExtension extends Extension
         $loader->load('security_csrf.xml');
     }
 
-    /**
-     * Loads the serializer configuration.
-     *
-     * @param array            $config    A serializer configuration array
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     * @param XmlFileLoader    $loader    An XmlFileLoader instance
-     */
     private function registerSerializerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$config['enabled']) {
@@ -965,8 +858,6 @@ class FrameworkExtension extends Extension
     /**
      * Gets a hash of the kernel root directory.
      *
-     * @param ContainerBuilder $container
-     *
      * @return string
      */
     private function getKernelRootHash(ContainerBuilder $container)

src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php

@@ -31,11 +31,6 @@ class DelegatingLoader extends BaseDelegatingLoader
     protected $logger;
     private $loading = false;
 
-    /**
-     * @param ControllerNameParser    $parser   A ControllerNameParser instance
-     * @param LoggerInterface         $logger   A LoggerInterface instance
-     * @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
-     */
     public function __construct(ControllerNameParser $parser, LoggerInterface $logger = null, LoaderResolverInterface $resolver)
     {
         $this->parser = $parser;

src/Symfony/Bundle/FrameworkBundle/Routing/Router.php

@@ -79,8 +79,6 @@ class Router extends BaseRouter implements WarmableInterface
      * - the route host,
      * - the route schemes,
      * - the route methods.
-     *
-     * @param RouteCollection $collection
      */
     private function resolveParameters(RouteCollection $collection)
     {

src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php

@@ -28,9 +28,6 @@ class Debugger implements DebuggerInterface
 {
     protected $logger;
 
-    /**
-     * @param LoggerInterface $logger A LoggerInterface instance
-     */
     public function __construct(LoggerInterface $logger = null)
     {
         $this->logger = $logger;

src/Symfony/Bundle/FrameworkBundle/Templating/DelegatingEngine.php

@@ -24,10 +24,6 @@ class DelegatingEngine extends BaseDelegatingEngine implements EngineInterface
 {
     protected $container;
 
-    /**
-     * @param ContainerInterface $container The DI container
-     * @param array              $engineIds An array of engine Ids
-     */
     public function __construct(ContainerInterface $container, array $engineIds)
     {
         $this->container = $container;

src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php

@@ -25,9 +25,6 @@ class GlobalVariables
 {
     protected $container;
 
-    /**
-     * @param ContainerInterface $container The DI container
-     */
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php

@@ -24,9 +24,6 @@ class ActionsHelper extends Helper
 {
     private $handler;
 
-    /**
-     * @param FragmentHandler $handler A FragmentHandler instance
-     */
     public function __construct(FragmentHandler $handler)
     {
         $this->handler = $handler;

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php

@@ -23,14 +23,8 @@ use Symfony\Component\Form\FormView;
  */
 class FormHelper extends Helper
 {
-    /**
-     * @var FormRendererInterface
-     */
     private $renderer;
 
-    /**
-     * @param FormRendererInterface $renderer
-     */
     public function __construct(FormRendererInterface $renderer)
     {
         $this->renderer = $renderer;
@@ -198,8 +192,6 @@ class FormHelper extends Helper
     /**
      * Renders the errors of the given view.
      *
-     * @param FormView $view The view to render the errors for
-     *
      * @return string The HTML markup
      */
     public function errors(FormView $view)

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php

@@ -23,9 +23,6 @@ class RouterHelper extends Helper
 {
     protected $generator;
 
-    /**
-     * @param UrlGeneratorInterface $router A Router instance
-     */
     public function __construct(UrlGeneratorInterface $router)
     {
         $this->generator = $router;

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php

@@ -21,9 +21,6 @@ class TranslatorHelper extends Helper
 {
     protected $translator;
 
-    /**
-     * @param TranslatorInterface $translator A TranslatorInterface instance
-     */
     public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;

src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php

@@ -25,9 +25,6 @@ class FilesystemLoader implements LoaderInterface
 {
     protected $locator;
 
-    /**
-     * @param FileLocatorInterface $locator A FileLocatorInterface instance
-     */
     public function __construct(FileLocatorInterface $locator)
     {
         $this->locator = $locator;

src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php

@@ -42,8 +42,6 @@ class TemplateLocator implements FileLocatorInterface
     /**
      * Returns a full path for a given file.
      *
-     * @param TemplateReferenceInterface $template A template
-     *
      * @return string The full path for the file
      */
     protected function getCacheKey($template)

src/Symfony/Bundle/FrameworkBundle/Templating/PhpEngine.php

@@ -26,12 +26,6 @@ class PhpEngine extends BasePhpEngine implements EngineInterface
 {
     protected $container;
 
-    /**
-     * @param TemplateNameParserInterface $parser    A TemplateNameParserInterface instance
-     * @param ContainerInterface          $container The DI container
-     * @param LoaderInterface             $loader    A loader instance
-     * @param GlobalVariables|null        $globals   A GlobalVariables instance or null
-     */
     public function __construct(TemplateNameParserInterface $parser, ContainerInterface $container, LoaderInterface $loader, GlobalVariables $globals = null)
     {
         $this->container = $container;

src/Symfony/Bundle/FrameworkBundle/Templating/TemplateNameParser.php

@@ -27,9 +27,6 @@ class TemplateNameParser extends BaseTemplateNameParser
     protected $kernel;
     protected $cache = array();
 
-    /**
-     * @param KernelInterface $kernel A KernelInterface instance
-     */
     public function __construct(KernelInterface $kernel)
     {
         $this->kernel = $kernel;

src/Symfony/Bundle/FrameworkBundle/Templating/TimedPhpEngine.php

@@ -25,13 +25,6 @@ class TimedPhpEngine extends PhpEngine
 {
     protected $stopwatch;
 
-    /**
-     * @param TemplateNameParserInterface $parser    A TemplateNameParserInterface instance
-     * @param ContainerInterface          $container A ContainerInterface instance
-     * @param LoaderInterface             $loader    A LoaderInterface instance
-     * @param Stopwatch                   $stopwatch A Stopwatch instance
-     * @param GlobalVariables             $globals   A GlobalVariables instance
-     */
     public function __construct(TemplateNameParserInterface $parser, ContainerInterface $container, LoaderInterface $loader, Stopwatch $stopwatch, GlobalVariables $globals = null)
     {
         parent::__construct($parser, $container, $loader, $globals);

src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php

@@ -135,8 +135,6 @@ abstract class KernelTestCase extends TestCase
 
     /**
      * Boots the Kernel for this test.
-     *
-     * @param array $options
      */
     protected static function bootKernel(array $options = array())
     {
@@ -154,8 +152,6 @@ abstract class KernelTestCase extends TestCase
      *  * environment
      *  * debug
      *
-     * @param array $options An array of options
-     *
      * @return KernelInterface A KernelInterface instance
      */
     protected static function createKernel(array $options = array())

src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php

@@ -209,8 +209,6 @@ class RouterTest extends TestCase
     }
 
     /**
-     * @param RouteCollection $routes
-     *
      * @return \Symfony\Component\DependencyInjection\Container
      */
     private function getServiceContainer(RouteCollection $routes)

src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php

@@ -29,15 +29,11 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
 
     /**
      * Prefix for new found message.
-     *
-     * @var string
      */
     private $prefix = '';
 
     /**
      * The sequence that captures translation messages.
-     *
-     * @var array
      */
     protected $sequences = array(
         array(

src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php

@@ -56,8 +56,6 @@ class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
     /**
      * Returns the validator for the supplied constraint.
      *
-     * @param Constraint $constraint A constraint
-     *
      * @return ConstraintValidatorInterface A validator for the supplied constraint
      *
      * @throws ValidatorException      When the validator class does not exist

src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php

@@ -26,10 +26,6 @@ class SecurityDataCollector extends DataCollector
     private $tokenStorage;
     private $roleHierarchy;
 
-    /**
-     * @param TokenStorageInterface|null  $tokenStorage
-     * @param RoleHierarchyInterface|null $roleHierarchy
-     */
     public function __construct(TokenStorageInterface $tokenStorage = null, RoleHierarchyInterface $roleHierarchy = null)
     {
         $this->tokenStorage = $tokenStorage;

src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php

@@ -36,10 +36,6 @@ class MainConfiguration implements ConfigurationInterface
     private $factories;
     private $userProviderFactories;
 
-    /**
-     * @param array $factories
-     * @param array $userProviderFactories
-     */
     public function __construct(array $factories, array $userProviderFactories)
     {
         $this->factories = $factories;

src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php

@@ -144,8 +144,6 @@ abstract class AbstractFactory implements SecurityFactoryInterface
      * Subclasses may disable remember-me features for the listener, by
      * always returning false from this method.
      *
-     * @param array $config
-     *
      * @return bool Whether a possibly configured RememberMeServices should be set for this listener
      */
     protected function isRememberMeAware($config)

src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

@@ -160,11 +160,8 @@ class SecurityExtension extends Extension
 
     /**
      * Loads the web configuration.
-     *
-     * @param array            $config    An array of configuration settings
-     * @param ContainerBuilder $container A ContainerBuilder instance
      */
-    private function createRoleHierarchy($config, ContainerBuilder $container)
+    private function createRoleHierarchy(array $config, ContainerBuilder $container)
     {
         if (!isset($config['role_hierarchy'])) {
             $container->removeDefinition('security.access.role_hierarchy_voter');

src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/MainConfigurationTest.php

@@ -20,8 +20,6 @@ class MainConfigurationTest extends TestCase
     /**
      * The minimal, required config needed to not have any required validation
      * issues.
-     *
-     * @var array
      */
     protected static $minimalConfig = array(
         'providers' => array(

src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginFormType.php

@@ -31,9 +31,6 @@ class UserLoginFormType extends AbstractType
 {
     private $request;
 
-    /**
-     * @param Request $request A request instance
-     */
     public function __construct(Request $request)
     {
         $this->request = $request;

src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php

@@ -29,10 +29,6 @@ class TemplateCacheCacheWarmer implements CacheWarmerInterface
     protected $container;
     protected $finder;
 
-    /**
-     * @param ContainerInterface           $container The dependency injection container
-     * @param TemplateFinderInterface|null $finder    The template paths cache warmer
-     */
     public function __construct(ContainerInterface $container, TemplateFinderInterface $finder = null)
     {
         // We don't inject the Twig environment directly as it depends on the

src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php

@@ -50,10 +50,6 @@ class ExceptionController
      * the exception page (when true). If it is not present, the "debug" value passed into the constructor will
      * be used.
      *
-     * @param Request              $request   The request
-     * @param FlattenException     $exception A FlattenException instance
-     * @param DebugLoggerInterface $logger    A DebugLoggerInterface instance
-     *
      * @return Response
      *
      * @throws \InvalidArgumentException When the exception template does not exist

src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php

@@ -27,9 +27,6 @@ class TwigExtension extends Extension
 {
     /**
      * Responds to the twig configuration parameter.
-     *
-     * @param array            $configs
-     * @param ContainerBuilder $container
      */
     public function load(array $configs, ContainerBuilder $container)
     {

src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php

@@ -28,10 +28,6 @@ class FilesystemLoader extends BaseFilesystemLoader
     protected $locator;
     protected $parser;
 
-    /**
-     * @param FileLocatorInterface        $locator A FileLocatorInterface instance
-     * @param TemplateNameParserInterface $parser  A TemplateNameParserInterface instance
-     */
     public function __construct(FileLocatorInterface $locator, TemplateNameParserInterface $parser)
     {
         parent::__construct(array());

src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php

@@ -29,8 +29,6 @@ class RenderTokenParser extends AbstractTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token
-     *
      * @return Node
      */
     public function parse(Token $token)

src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php

@@ -206,8 +206,6 @@ class ProfilerController
     /**
      * Renders the profiler search bar.
      *
-     * @param Request $request The current HTTP Request
-     *
      * @return Response A Response instance
      *
      * @throws NotFoundHttpException
@@ -298,8 +296,6 @@ class ProfilerController
     /**
      * Narrows the search bar.
      *
-     * @param Request $request The current HTTP Request
-     *
      * @return Response A Response instance
      *
      * @throws NotFoundHttpException

src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php

@@ -63,8 +63,6 @@ class TemplateManager
     /**
      * Gets the templates for a given profile.
      *
-     * @param Profile $profile
-     *
      * @return Template[]
      *
      * @deprecated not used anymore internally
@@ -82,8 +80,6 @@ class TemplateManager
     /**
      * Gets template names of templates that are present in the viewed profile.
      *
-     * @param Profile $profile
-     *
      * @return array
      *
      * @throws \UnexpectedValueException

src/Symfony/Component/Asset/Packages.php

@@ -38,11 +38,6 @@ class Packages
         }
     }
 
-    /**
-     * Sets the default package.
-     *
-     * @param PackageInterface $defaultPackage The default package
-     */
     public function setDefaultPackage(PackageInterface $defaultPackage)
     {
         $this->defaultPackage = $defaultPackage;

src/Symfony/Component/BrowserKit/Client.php

@@ -212,8 +212,6 @@ abstract class Client
     /**
      * Clicks on a given link.
      *
-     * @param Link $link A Link instance
-     *
      * @return Crawler
      */
     public function click(Link $link)

src/Symfony/Component/BrowserKit/Cookie.php

@@ -21,8 +21,6 @@ class Cookie
     /**
      * Handles dates as defined by RFC 2616 section 3.3.1, and also some other
      * non-standard, but common formats.
-     *
-     * @var array
      */
     private static $dateFormats = array(
         'D, d M Y H:i:s T',

src/Symfony/Component/BrowserKit/CookieJar.php

@@ -20,11 +20,6 @@ class CookieJar
 {
     protected $cookieJar = array();
 
-    /**
-     * Sets a cookie.
-     *
-     * @param Cookie $cookie A Cookie instance
-     */
     public function set(Cookie $cookie)
     {
         $this->cookieJar[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;

src/Symfony/Component/BrowserKit/History.php

@@ -32,8 +32,6 @@ class History
 
     /**
      * Adds a Request to the history.
-     *
-     * @param Request $request A Request instance
      */
     public function add(Request $request)
     {

src/Symfony/Component/ClassLoader/ClassCollectionLoader.php

@@ -294,8 +294,6 @@ REGEX;
     /**
      * Gets an ordered array of passed classes including all their dependencies.
      *
-     * @param array $classes
-     *
      * @return \ReflectionClass[] An array of sorted \ReflectionClass instances (dependencies added if needed)
      *
      * @throws \InvalidArgumentException When a class can't be loaded

src/Symfony/Component/ClassLoader/Psr4ClassLoader.php

@@ -20,9 +20,6 @@ namespace Symfony\Component\ClassLoader;
  */
 class Psr4ClassLoader
 {
-    /**
-     * @var array
-     */
     private $prefixes = array();
 
     /**

src/Symfony/Component/Config/Definition/ArrayNode.php

@@ -195,8 +195,6 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
     /**
      * Adds a child node.
      *
-     * @param NodeInterface $node The child node to add
-     *
      * @throws \InvalidArgumentException when the child node has no name
      * @throws \InvalidArgumentException when the child node's name is not unique
      */

src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php

@@ -48,8 +48,6 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
 
     /**
      * Sets a custom children builder.
-     *
-     * @param NodeBuilder $builder A custom NodeBuilder
      */
     public function setBuilder(NodeBuilder $builder)
     {
@@ -318,8 +316,6 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
      *         ->append($this->getBarNodeDefinition())
      *     ;
      *
-     * @param NodeDefinition $node A NodeDefinition instance
-     *
      * @return $this
      */
     public function append(NodeDefinition $node)
@@ -416,8 +412,6 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
     /**
      * Validate the configuration of a concrete node.
      *
-     * @param ArrayNode $node The related node
-     *
      * @throws InvalidDefinitionException
      */
     protected function validateConcreteNode(ArrayNode $node)
@@ -452,8 +446,6 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
     /**
      * Validate the configuration of a prototype node.
      *
-     * @param PrototypedArrayNode $node The related node
-     *
      * @throws InvalidDefinitionException
      */
     protected function validatePrototypeNode(PrototypedArrayNode $node)

src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php

@@ -23,8 +23,6 @@ class EnumNodeDefinition extends ScalarNodeDefinition
     private $values;
 
     /**
-     * @param array $values
-     *
      * @return $this
      */
     public function values(array $values)

src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php

@@ -25,9 +25,6 @@ class ExprBuilder
     public $ifPart;
     public $thenPart;
 
-    /**
-     * @param NodeDefinition $node The related node
-     */
     public function __construct(NodeDefinition $node)
     {
         $this->node = $node;
@@ -36,8 +33,6 @@ class ExprBuilder
     /**
      * Marks the expression as being always used.
      *
-     * @param \Closure $then
-     *
      * @return $this
      */
     public function always(\Closure $then = null)
@@ -56,8 +51,6 @@ class ExprBuilder
      *
      * The default one tests if the value is true.
      *
-     * @param \Closure $closure
-     *
      * @return $this
      */
     public function ifTrue(\Closure $closure = null)
@@ -110,8 +103,6 @@ class ExprBuilder
     /**
      * Tests if the value is in an array.
      *
-     * @param array $array
-     *
      * @return $this
      */
     public function ifInArray(array $array)
@@ -124,8 +115,6 @@ class ExprBuilder
     /**
      * Tests if the value is not in an array.
      *
-     * @param array $array
-     *
      * @return $this
      */
     public function ifNotInArray(array $array)
@@ -138,8 +127,6 @@ class ExprBuilder
     /**
      * Sets the closure to run if the test pass.
      *
-     * @param \Closure $closure
-     *
      * @return $this
      */
     public function then(\Closure $closure)

src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php

@@ -22,9 +22,6 @@ class MergeBuilder
     public $allowFalse = false;
     public $allowOverwrite = true;
 
-    /**
-     * @param NodeDefinition $node The related node
-     */
     public function __construct(NodeDefinition $node)
     {
         $this->node = $node;

src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php

@@ -37,8 +37,6 @@ class NodeBuilder implements NodeParentInterface
     /**
      * Set the parent node.
      *
-     * @param ParentNodeDefinitionInterface $parent The parent node
-     *
      * @return $this
      */
     public function setParent(ParentNodeDefinitionInterface $parent = null)
@@ -177,8 +175,6 @@ class NodeBuilder implements NodeParentInterface
      *         ->end()
      *     ;
      *
-     * @param NodeDefinition $node
-     *
      * @return $this
      */
     public function append(NodeDefinition $node)

src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php

@@ -32,10 +32,6 @@ abstract class NodeDefinition implements NodeParentInterface
     protected $nullEquivalent;
     protected $trueEquivalent = true;
     protected $falseEquivalent = false;
-
-    /**
-     * @var NodeParentInterface|null
-     */
     protected $parent;
     protected $attributes = array();
 
@@ -52,8 +48,6 @@ abstract class NodeDefinition implements NodeParentInterface
     /**
      * Sets the parent node.
      *
-     * @param NodeParentInterface $parent The parent
-     *
      * @return $this
      */
     public function setParent(NodeParentInterface $parent)

src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php

@@ -22,9 +22,6 @@ class NormalizationBuilder
     public $before = array();
     public $remappings = array();
 
-    /**
-     * @param NodeDefinition $node The related node
-     */
     public function __construct(NodeDefinition $node)
     {
         $this->node = $node;
@@ -48,8 +45,6 @@ class NormalizationBuilder
     /**
      * Registers a closure to run before the normalization or an expression builder to build it if null is provided.
      *
-     * @param \Closure $closure
-     *
      * @return ExprBuilder|$this
      */
     public function before(\Closure $closure = null)

src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php

@@ -21,9 +21,6 @@ class ValidationBuilder
     protected $node;
     public $rules = array();
 
-    /**
-     * @param NodeDefinition $node The related node
-     */
     public function __construct(NodeDefinition $node)
     {
         $this->node = $node;
@@ -32,8 +29,6 @@ class ValidationBuilder
     /**
      * Registers a closure to run as normalization or an expression builder to build it if null is provided.
      *
-     * @param \Closure $closure
-     *
      * @return ExprBuilder|$this
      */
     public function rule(\Closure $closure = null)

src/Symfony/Component/Config/Definition/PrototypedArrayNode.php

@@ -150,8 +150,6 @@ class PrototypedArrayNode extends ArrayNode
 
     /**
      * Sets the node prototype.
-     *
-     * @param PrototypeNodeInterface $node
      */
     public function setPrototype(PrototypeNodeInterface $node)
     {
@@ -171,8 +169,6 @@ class PrototypedArrayNode extends ArrayNode
     /**
      * Disable adding concrete children for prototyped nodes.
      *
-     * @param NodeInterface $node The child node to add
-     *
      * @throws Exception
      */
     public function addChild(NodeInterface $node)

src/Symfony/Component/Config/Loader/DelegatingLoader.php

@@ -23,9 +23,6 @@ use Symfony\Component\Config\Exception\FileLoaderLoadException;
  */
 class DelegatingLoader extends Loader
 {
-    /**
-     * @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
-     */
     public function __construct(LoaderResolverInterface $resolver)
     {
         $this->resolver = $resolver;

src/Symfony/Component/Config/Loader/FileLoader.php

@@ -22,21 +22,12 @@ use Symfony\Component\Config\Exception\FileLoaderImportCircularReferenceExceptio
  */
 abstract class FileLoader extends Loader
 {
-    /**
-     * @var array
-     */
     protected static $loading = array();
 
-    /**
-     * @var FileLocatorInterface
-     */
     protected $locator;
 
     private $currentDir;
 
-    /**
-     * @param FileLocatorInterface $locator A FileLocatorInterface instance
-     */
     public function __construct(FileLocatorInterface $locator)
     {
         $this->locator = $locator;

src/Symfony/Component/Config/Loader/LoaderInterface.php

@@ -47,8 +47,6 @@ interface LoaderInterface
 
     /**
      * Sets the loader resolver.
-     *
-     * @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
      */
     public function setResolver(LoaderResolverInterface $resolver);
 }

src/Symfony/Component/Config/Loader/LoaderResolver.php

@@ -50,11 +50,6 @@ class LoaderResolver implements LoaderResolverInterface
         return false;
     }
 
-    /**
-     * Adds a loader.
-     *
-     * @param LoaderInterface $loader A LoaderInterface instance
-     */
     public function addLoader(LoaderInterface $loader)
     {
         $this->loaders[] = $loader;

src/Symfony/Component/Console/Application.php

@@ -93,9 +93,6 @@ class Application
     /**
      * 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
      *
      * @throws \Exception When running fails. Bypass this when {@link setCatchExceptions()}.
@@ -157,9 +154,6 @@ class Application
     /**
      * 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)
@@ -202,11 +196,6 @@ class Application
         return $exitCode;
     }
 
-    /**
-     * Set a helper set to be used with the command.
-     *
-     * @param HelperSet $helperSet The helper set
-     */
     public function setHelperSet(HelperSet $helperSet)
     {
         $this->helperSet = $helperSet;
@@ -226,11 +215,6 @@ class Application
         return $this->helperSet;
     }
 
-    /**
-     * Set an input definition to be used with this application.
-     *
-     * @param InputDefinition $definition The input definition
-     */
     public function setDefinition(InputDefinition $definition)
     {
         $this->definition = $definition;
@@ -370,8 +354,6 @@ class Application
      * If a command with the same name already exists, it will be overridden.
      * If the command is not enabled it will not be added.
      *
-     * @param Command $command A Command object
-     *
      * @return Command|null The registered command if enabled or null
      */
     public function add(Command $command)
@@ -660,9 +642,6 @@ class Application
 
     /**
      * Renders a caught exception.
-     *
-     * @param \Exception      $e      An exception instance
-     * @param OutputInterface $output An OutputInterface instance
      */
     public function renderException($e, $output)
     {
@@ -811,9 +790,6 @@ class Application
 
     /**
      * Configures the input and output instances based on the user arguments and options.
-     *
-     * @param InputInterface  $input  An InputInterface instance
-     * @param OutputInterface $output An OutputInterface instance
      */
     protected function configureIO(InputInterface $input, OutputInterface $output)
     {
@@ -852,10 +828,6 @@ class Application
      * If an event dispatcher has been attached to the application,
      * events are also dispatched during the life-cycle of the command.
      *
-     * @param Command         $command A Command instance
-     * @param InputInterface  $input   An Input instance
-     * @param OutputInterface $output  An Output instance
-     *
      * @return int 0 if everything went fine, or an error code
      */
     protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output)
@@ -908,8 +880,6 @@ class Application
     /**
      * Gets the name of the command based on input.
      *
-     * @param InputInterface $input The input interface
-     *
      * @return string The command name
      */
     protected function getCommandName(InputInterface $input)

src/Symfony/Component/Console/Command/Command.php

@@ -74,11 +74,6 @@ class Command
         $this->ignoreValidationErrors = true;
     }
 
-    /**
-     * Sets the application instance for this command.
-     *
-     * @param Application $application An Application instance
-     */
     public function setApplication(Application $application = null)
     {
         $this->application = $application;
@@ -89,11 +84,6 @@ class Command
         }
     }
 
-    /**
-     * Sets the helper set.
-     *
-     * @param HelperSet $helperSet A HelperSet instance
-     */
     public function setHelperSet(HelperSet $helperSet)
     {
         $this->helperSet = $helperSet;
@@ -147,9 +137,6 @@ class Command
      * execute() method, you set the code to execute by passing
      * a Closure to the setCode() method.
      *
-     * @param InputInterface  $input  An InputInterface instance
-     * @param OutputInterface $output An OutputInterface instance
-     *
      * @return null|int null or 0 if everything went fine, or an error code
      *
      * @throws \LogicException When this abstract method is not implemented
@@ -167,9 +154,6 @@ class Command
      * This method is executed before the InputDefinition is validated.
      * This means that this is the only place where the command can
      * interactively ask for values of missing required arguments.
-     *
-     * @param InputInterface  $input  An InputInterface instance
-     * @param OutputInterface $output An OutputInterface instance
      */
     protected function interact(InputInterface $input, OutputInterface $output)
     {
@@ -180,9 +164,6 @@ class Command
      *
      * This is mainly useful when a lot of commands extends one main command
      * where some things need to be initialized based on the input arguments and options.
-     *
-     * @param InputInterface  $input  An InputInterface instance
-     * @param OutputInterface $output An OutputInterface instance
      */
     protected function initialize(InputInterface $input, OutputInterface $output)
     {
@@ -195,9 +176,6 @@ class Command
      * setCode() method or by overriding the execute() method
      * in a sub-class.
      *
-     * @param InputInterface  $input  An InputInterface instance
-     * @param OutputInterface $output An OutputInterface instance
-     *
      * @return int The command exit code
      *
      * @throws \Exception When binding input fails. Bypass this by calling {@link ignoreValidationErrors()}.

src/Symfony/Component/Console/Command/HelpCommand.php

@@ -57,11 +57,6 @@ EOF
         ;
     }
 
-    /**
-     * Sets the command.
-     *
-     * @param Command $command The command to set
-     */
     public function setCommand(Command $command)
     {
         $this->command = $command;

src/Symfony/Component/Console/Descriptor/ApplicationDescription.php

@@ -23,14 +23,7 @@ class ApplicationDescription
 {
     const GLOBAL_NAMESPACE = '_global';
 
-    /**
-     * @var Application
-     */
     private $application;
-
-    /**
-     * @var null|string
-     */
     private $namespace;
 
     /**
@@ -48,10 +41,6 @@ class ApplicationDescription
      */
     private $aliases;
 
-    /**
-     * @param Application $application
-     * @param string|null $namespace
-     */
     public function __construct(Application $application, $namespace = null)
     {
         $this->application = $application;
@@ -127,8 +116,6 @@ class ApplicationDescription
     }
 
     /**
-     * @param array $commands
-     *
      * @return array
      */
     private function sortCommands(array $commands)

src/Symfony/Component/Console/Descriptor/Descriptor.php

@@ -72,9 +72,6 @@ abstract class Descriptor implements DescriptorInterface
     /**
      * Describes an InputArgument instance.
      *
-     * @param InputArgument $argument
-     * @param array         $options
-     *
      * @return string|mixed
      */
     abstract protected function describeInputArgument(InputArgument $argument, array $options = array());
@@ -82,9 +79,6 @@ abstract class Descriptor implements DescriptorInterface
     /**
      * Describes an InputOption instance.
      *
-     * @param InputOption $option
-     * @param array       $options
-     *
      * @return string|mixed
      */
     abstract protected function describeInputOption(InputOption $option, array $options = array());
@@ -92,9 +86,6 @@ abstract class Descriptor implements DescriptorInterface
     /**
      * Describes an InputDefinition instance.
      *
-     * @param InputDefinition $definition
-     * @param array           $options
-     *
      * @return string|mixed
      */
     abstract protected function describeInputDefinition(InputDefinition $definition, array $options = array());
@@ -102,9 +93,6 @@ abstract class Descriptor implements DescriptorInterface
     /**
      * Describes a Command instance.
      *
-     * @param Command $command
-     * @param array   $options
-     *
      * @return string|mixed
      */
     abstract protected function describeCommand(Command $command, array $options = array());
@@ -112,9 +100,6 @@ abstract class Descriptor implements DescriptorInterface
     /**
      * Describes an Application instance.
      *
-     * @param Application $application
-     * @param array       $options
-     *
      * @return string|mixed
      */
     abstract protected function describeApplication(Application $application, array $options = array());

src/Symfony/Component/Console/Descriptor/JsonDescriptor.php

@@ -81,9 +81,6 @@ class JsonDescriptor extends Descriptor
     /**
      * Writes data as json.
      *
-     * @param array $data
-     * @param array $options
-     *
      * @return array|string
      */
     private function writeData(array $data, array $options)
@@ -92,8 +89,6 @@ class JsonDescriptor extends Descriptor
     }
 
     /**
-     * @param InputArgument $argument
-     *
      * @return array
      */
     private function getInputArgumentData(InputArgument $argument)
@@ -108,8 +103,6 @@ class JsonDescriptor extends Descriptor
     }
 
     /**
-     * @param InputOption $option
-     *
      * @return array
      */
     private function getInputOptionData(InputOption $option)
@@ -126,8 +119,6 @@ class JsonDescriptor extends Descriptor
     }
 
     /**
-     * @param InputDefinition $definition
-     *
      * @return array
      */
     private function getInputDefinitionData(InputDefinition $definition)
@@ -146,8 +137,6 @@ class JsonDescriptor extends Descriptor
     }
 
     /**
-     * @param Command $command
-     *
      * @return array
      */
     private function getCommandData(Command $command)

src/Symfony/Component/Console/Descriptor/TextDescriptor.php

@@ -282,7 +282,7 @@ class TextDescriptor extends Descriptor
      *
      * @return int
      */
-    private function calculateTotalWidthForOptions($options)
+    private function calculateTotalWidthForOptions(array $options)
     {
         $totalWidth = 0;
         foreach ($options as $option) {

src/Symfony/Component/Console/Descriptor/XmlDescriptor.php

@@ -27,8 +27,6 @@ use Symfony\Component\Console\Input\InputOption;
 class XmlDescriptor extends Descriptor
 {
     /**
-     * @param InputDefinition $definition
-     *
      * @return \DOMDocument
      */
     public function getInputDefinitionDocument(InputDefinition $definition)
@@ -50,8 +48,6 @@ class XmlDescriptor extends Descriptor
     }
 
     /**
-     * @param Command $command
-     *
      * @return \DOMDocument
      */
     public function getCommandDocument(Command $command)
@@ -172,9 +168,6 @@ class XmlDescriptor extends Descriptor
 
     /**
      * Appends document children to parent node.
-     *
-     * @param \DOMNode $parentNode
-     * @param \DOMNode $importedParent
      */
     private function appendDocument(\DOMNode $parentNode, \DOMNode $importedParent)
     {
@@ -186,8 +179,6 @@ class XmlDescriptor extends Descriptor
     /**
      * Writes DOM document.
      *
-     * @param \DOMDocument $dom
-     *
      * @return \DOMDocument|string
      */
     private function writeDocument(\DOMDocument $dom)
@@ -197,8 +188,6 @@ class XmlDescriptor extends Descriptor
     }
 
     /**
-     * @param InputArgument $argument
-     *
      * @return \DOMDocument
      */
     private function getInputArgumentDocument(InputArgument $argument)
@@ -223,8 +212,6 @@ class XmlDescriptor extends Descriptor
     }
 
     /**
-     * @param InputOption $option
-     *
      * @return \DOMDocument
      */
     private function getInputOptionDocument(InputOption $option)

src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php

@@ -170,9 +170,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
     }
 
     /**
-     * Sets multiple style options at once.
+     * {@inheritdoc}
-     *
-     * @param array $options
      */
     public function setOptions(array $options)
     {

src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php

@@ -48,8 +48,6 @@ interface OutputFormatterStyleInterface
 
     /**
      * Sets multiple style options at once.
-     *
-     * @param array $options
      */
     public function setOptions(array $options);
 

src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php

@@ -21,14 +21,8 @@ class OutputFormatterStyleStack
      */
     private $styles;
 
-    /**
-     * @var OutputFormatterStyleInterface
-     */
     private $emptyStyle;
 
-    /**
-     * @param OutputFormatterStyleInterface|null $emptyStyle
-     */
     public function __construct(OutputFormatterStyleInterface $emptyStyle = null)
     {
         $this->emptyStyle = $emptyStyle ?: new OutputFormatterStyle();
@@ -45,8 +39,6 @@ class OutputFormatterStyleStack
 
     /**
      * Pushes a style in the stack.
-     *
-     * @param OutputFormatterStyleInterface $style
      */
     public function push(OutputFormatterStyleInterface $style)
     {
@@ -56,8 +48,6 @@ class OutputFormatterStyleStack
     /**
      * Pops a style from the stack.
      *
-     * @param OutputFormatterStyleInterface|null $style
-     *
      * @return OutputFormatterStyleInterface
      *
      * @throws \InvalidArgumentException When style tags incorrectly nested
@@ -98,8 +88,6 @@ class OutputFormatterStyleStack
     }
 
     /**
-     * @param OutputFormatterStyleInterface $emptyStyle
-     *
      * @return $this
      */
     public function setEmptyStyle(OutputFormatterStyleInterface $emptyStyle)

src/Symfony/Component/Console/Helper/Helper.php

@@ -23,9 +23,7 @@ abstract class Helper implements HelperInterface
     protected $helperSet = null;
 
     /**
-     * Sets the helper set associated with this helper.
+     * {@inheritdoc}
-     *
-     * @param HelperSet $helperSet A HelperSet instance
      */
     public function setHelperSet(HelperSet $helperSet = null)
     {
@@ -33,9 +31,7 @@ abstract class Helper implements HelperInterface
     }
 
     /**
-     * Gets the helper set associated with this helper.
+     * {@inheritdoc}
-     *
-     * @return HelperSet|null
      */
     public function getHelperSet()
     {

src/Symfony/Component/Console/Helper/HelperInterface.php

@@ -20,8 +20,6 @@ interface HelperInterface
 {
     /**
      * Sets the helper set associated with this helper.
-     *
-     * @param HelperSet $helperSet A HelperSet instance
      */
     public function setHelperSet(HelperSet $helperSet = null);