diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
index a57b9ae6ea151..cc2364af60d76 100644
--- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
+++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -40,8 +40,7 @@ public function __construct(ManagerRegistry $registry)
     /**
      * Adds the stack logger for a connection.
      *
-     * @param string     $name
-     * @param DebugStack $logger
+     * @param string $name
      */
     public function addLogger($name, DebugStack $logger)
     {
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
index 8426d307da5da..6b115760cbe34 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -36,8 +36,7 @@ abstract class AbstractDoctrineExtension extends Extension
     protected $drivers = array();
 
     /**
-     * @param array            $objectManager A configured object manager
-     * @param ContainerBuilder $container     A ContainerBuilder instance
+     * @param array $objectManager A configured object manager
      *
      * @throws \InvalidArgumentException
      */
@@ -118,7 +117,6 @@ protected function setMappingDriverAlias($mappingConfig, $mappingName)
     /**
      * Register the mapping driver configuration for later use with the object managers metadata driver chain.
      *
-     * @param array  $mappingConfig
      * @param string $mappingName
      *
      * @throws \InvalidArgumentException
@@ -173,8 +171,7 @@ protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \Re
     /**
      * Register all the collected mapping information with the object manager by registering the appropriate mapping drivers.
      *
-     * @param array            $objectManager
-     * @param ContainerBuilder $container     A ContainerBuilder instance
+     * @param array $objectManager
      */
     protected function registerMappingDrivers($objectManager, ContainerBuilder $container)
     {
@@ -226,7 +223,6 @@ protected function registerMappingDrivers($objectManager, ContainerBuilder $cont
     /**
      * Assertion if the specified mapping information is valid.
      *
-     * @param array  $mappingConfig
      * @param string $objectManagerName
      *
      * @throws \InvalidArgumentException
@@ -253,8 +249,7 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object
     /**
      * Detects what metadata driver to use for the supplied directory.
      *
-     * @param string           $dir       A directory path
-     * @param ContainerBuilder $container A ContainerBuilder instance
+     * @param string $dir A directory path
      *
      * @return string|null A metadata driver short name, if one can be detected
      */
@@ -289,9 +284,8 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
     /**
      * Loads a configured object manager metadata, query or result cache driver.
      *
-     * @param array            $objectManager A configured object manager
-     * @param ContainerBuilder $container     A ContainerBuilder instance
-     * @param string           $cacheName
+     * @param array  $objectManager A configured object manager
+     * @param string $cacheName
      *
      * @throws \InvalidArgumentException in case of unknown driver type
      */
@@ -303,10 +297,9 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB
     /**
      * Loads a cache driver.
      *
-     * @param string           $cacheName         The cache driver name
-     * @param string           $objectManagerName The object manager name
-     * @param array            $cacheDriver       The cache driver mapping
-     * @param ContainerBuilder $container         The ContainerBuilder instance
+     * @param string $cacheName         The cache driver name
+     * @param string $objectManagerName The object manager name
+     * @param array  $cacheDriver       The cache driver mapping
      *
      * @return string
      *
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
index 82c1b7c811386..eb5af44d66e3d 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
@@ -45,9 +45,8 @@ public function process(ContainerBuilder $container)
      * Gets the validation mapping files for the format and extends them with
      * files matching a doctrine search pattern (Resources/config/validation.orm.xml).
      *
-     * @param ContainerBuilder $container
-     * @param string           $mapping
-     * @param string           $extension
+     * @param string $mapping
+     * @param string $extension
      */
     private function updateValidatorMappingFiles(ContainerBuilder $container, $mapping, $extension)
     {
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
index b9f51144746d5..5046d9e118ab8 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -135,8 +135,7 @@ private function getEventManagerDef(ContainerBuilder $container, $name)
      * @see https://bugs.php.net/bug.php?id=53710
      * @see https://bugs.php.net/bug.php?id=60926
      *
-     * @param string           $tagName
-     * @param ContainerBuilder $container
+     * @param string $tagName
      *
      * @return array
      */
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
index bf5890c1e69f0..85951c6a99c9d 100644
--- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
+++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -42,7 +42,6 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface
      * mapper implementations.
      *
      * @param ChoiceListFactoryInterface $factory      The factory for creating the loaded choice list
-     * @param ObjectManager              $manager      The object manager
      * @param string                     $class        The class name of the loaded objects
      * @param IdReader                   $idReader     The reader for the object IDs
      * @param null|EntityLoaderInterface $objectLoader The objects loader
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
index 2c226f50a0ad5..e2429a961fabc 100644
--- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
+++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
@@ -303,8 +303,6 @@ public function getValuesForChoices(array $entities)
     /**
      * Returns the indices corresponding to the given entities.
      *
-     * @param array $entities
-     *
      * @return array
      *
      * @see ChoiceListInterface
@@ -346,8 +344,6 @@ public function getIndicesForChoices(array $entities)
     /**
      * Returns the entities corresponding to the given values.
      *
-     * @param array $values
-     *
      * @return array
      *
      * @see ChoiceListInterface
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
index 357119f86d8cd..032306ff404c4 100644
--- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
+++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -327,9 +327,8 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * Return the default loader object.
      *
-     * @param ObjectManager $manager
-     * @param mixed         $queryBuilder
-     * @param string        $class
+     * @param mixed  $queryBuilder
+     * @param string $class
      *
      * @return EntityLoaderInterface
      */
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
index aeea2425206c1..7767822ec36e0 100644
--- a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
+++ b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
@@ -46,9 +46,8 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * Return the default loader object.
      *
-     * @param ObjectManager $manager
-     * @param QueryBuilder  $queryBuilder
-     * @param string        $class
+     * @param QueryBuilder $queryBuilder
+     * @param string       $class
      *
      * @return ORMQueryBuilderLoader
      */
diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
index 6ae9c469bb166..d3ca57570872b 100644
--- a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
+++ b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
@@ -54,8 +54,7 @@ class DbalSessionHandler implements \SessionHandlerInterface
     private $timeCol = 'sess_time';
 
     /**
-     * @param Connection $con       A connection
-     * @param string     $tableName Table name
+     * @param string $tableName Table name
      */
     public function __construct(Connection $con, $tableName = 'sessions')
     {
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
index 0a9dae3b200fe..02e77235e7ff4 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -187,7 +187,6 @@ public function providerBasicDrivers()
 
     /**
      * @param string $class
-     * @param array  $config
      *
      * @dataProvider providerBasicDrivers
      */
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
index 8c7876eae342d..b703baa1d0ddf 100644
--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -33,8 +33,7 @@ public function __construct(ManagerRegistry $registry)
     }
 
     /**
-     * @param object     $entity
-     * @param Constraint $constraint
+     * @param object $entity
      *
      * @throws UnexpectedTypeException
      * @throws ConstraintDefinitionException
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
index 838c33a8368b1..4a2a6da2234d7 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -38,8 +38,7 @@ protected function setUp()
     /**
      * @dataProvider getProxyCandidates
      *
-     * @param Definition $definition
-     * @param bool       $expected
+     * @param bool $expected
      */
     public function testIsProxyCandidate(Definition $definition, $expected)
     {
diff --git a/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php b/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
index fd33c34de2695..4f16d8ed55c71 100644
--- a/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
+++ b/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
@@ -34,8 +34,7 @@ class MessageDataCollector extends DataCollector
      * We don't inject the message logger and mailer here
      * to avoid the creation of these objects when no emails are sent.
      *
-     * @param ContainerInterface $container A ContainerInterface instance
-     * @param bool               $isSpool
+     * @param bool $isSpool
      */
     public function __construct(ContainerInterface $container, $isSpool)
     {
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
index 1fbce9c6af811..6061b38cb96a6 100644
--- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
+++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -104,8 +104,7 @@ public function getPriority()
     }
 
     /**
-     * @param Node $arguments
-     * @param int  $index
+     * @param int $index
      *
      * @return string|null
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
index d68fa7ce77674..a33d52897745a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
@@ -29,9 +29,7 @@ class TemplateFinder implements TemplateFinderInterface
     private $templates;
 
     /**
-     * @param KernelInterface             $kernel  A KernelInterface instance
-     * @param TemplateNameParserInterface $parser  A TemplateNameParserInterface instance
-     * @param string                      $rootDir The directory where global templates can be stored
+     * @param string $rootDir The directory where global templates can be stored
      */
     public function __construct(KernelInterface $kernel, TemplateNameParserInterface $parser, $rootDir)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
index 5e9014bfc5ddd..560dda7b429d9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -173,10 +173,9 @@ protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = tr
     }
 
     /**
-     * @param KernelInterface $parent
-     * @param string          $namespace
-     * @param string          $parentClass
-     * @param string          $warmupDir
+     * @param string $namespace
+     * @param string $parentClass
+     * @param string $warmupDir
      *
      * @return KernelInterface
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php
index 2c45de91680f9..fc893b184896c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php
@@ -171,9 +171,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * Determine the absolute file path for the router script, using the environment to choose a standard script
      * if no custom router script is specified.
      *
-     * @param string|null     $router File path of the custom router script, if set by the user; otherwise null
-     * @param string          $env    The application environment
-     * @param OutputInterface $output An OutputInterface instance
+     * @param string|null $router File path of the custom router script, if set by the user; otherwise null
+     * @param string      $env    The application environment
      *
      * @return string|bool The absolute file path of the router script, or false on failure
      */
@@ -199,10 +198,9 @@ private function determineRouterScript($router, $env, OutputInterface $output)
     /**
      * Creates a process to start PHP's built-in web server.
      *
-     * @param OutputInterface $output       A OutputInterface instance
-     * @param string          $address      IP address and port to listen to
-     * @param string          $documentRoot The application's document root
-     * @param string          $router       The router filename
+     * @param string $address      IP address and port to listen to
+     * @param string $documentRoot The application's document root
+     * @param string $router       The router filename
      *
      * @return Process The process
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
index 3d1bbd831da19..fa00f065fdac5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -104,8 +104,7 @@ protected function write($content, $decorated = false)
     /**
      * Writes content to output.
      *
-     * @param Table $table
-     * @param bool  $decorated
+     * @param bool $decorated
      */
     protected function renderTable(Table $table, $decorated = false)
     {
@@ -145,7 +144,6 @@ abstract protected function describeContainerTags(ContainerBuilder $builder, arr
      * * name: name of described service
      *
      * @param Definition|Alias|object $service
-     * @param array                   $options
      */
     abstract protected function describeContainerService($service, array $options = array());
 
@@ -184,7 +182,6 @@ abstract protected function describeEventDispatcherListeners(EventDispatcherInte
      * Describes a callable.
      *
      * @param callable $callable
-     * @param array    $options
      */
     abstract protected function describeCallable($callable, array $options = array());
 
@@ -231,8 +228,7 @@ protected function formatParameter($value)
     }
 
     /**
-     * @param ContainerBuilder $builder
-     * @param string           $serviceId
+     * @param string $serviceId
      *
      * @return mixed
      */
@@ -256,8 +252,7 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
     }
 
     /**
-     * @param ContainerBuilder $builder
-     * @param bool             $showPrivate
+     * @param bool $showPrivate
      *
      * @return array
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
index e50a2fc0b20ba..7ef2e4655992b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -199,8 +199,7 @@ protected function getRouteData(Route $route)
     }
 
     /**
-     * @param Definition $definition
-     * @param bool       $omitTags
+     * @param bool $omitTags
      *
      * @return array
      */
@@ -274,8 +273,7 @@ private function getContainerAliasData(Alias $alias)
     }
 
     /**
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param string|null              $event
+     * @param string|null $event
      *
      * @return array
      */
@@ -303,7 +301,6 @@ private function getEventDispatcherListenersData(EventDispatcherInterface $event
 
     /**
      * @param callable $callable
-     * @param array    $options
      *
      * @return array
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
index 388c3e70845cf..a73f5f0be6969 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -435,7 +435,6 @@ private function formatCallable($callable)
 
     /**
      * @param string $content
-     * @param array  $options
      */
     private function writeText($content, array $options = array())
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
index e2bf073f6df3c..afded4b9d7a5b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -147,7 +147,6 @@ private function getRouteCollectionDocument(RouteCollection $routes)
     }
 
     /**
-     * @param Route       $route
      * @param string|null $name
      *
      * @return \DOMDocument
@@ -233,8 +232,7 @@ private function getContainerParametersDocument(ParameterBag $parameters)
     }
 
     /**
-     * @param ContainerBuilder $builder
-     * @param bool             $showPrivate
+     * @param bool $showPrivate
      *
      * @return \DOMDocument
      */
@@ -280,9 +278,8 @@ private function getContainerServiceDocument($service, $id)
     }
 
     /**
-     * @param ContainerBuilder $builder
-     * @param string|null      $tag
-     * @param bool             $showPrivate
+     * @param string|null $tag
+     * @param bool        $showPrivate
      *
      * @return \DOMDocument
      */
@@ -308,7 +305,6 @@ private function getContainerServicesDocument(ContainerBuilder $builder, $tag =
     }
 
     /**
-     * @param Definition  $definition
      * @param string|null $id
      * @param bool        $omitTags
      *
@@ -389,7 +385,6 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu
     }
 
     /**
-     * @param Alias       $alias
      * @param string|null $id
      *
      * @return \DOMDocument
@@ -427,8 +422,7 @@ private function getContainerParameterDocument($parameter, $options = array())
     }
 
     /**
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param string|null              $event
+     * @param string|null $event
      *
      * @return \DOMDocument
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
index e04d367c85487..25edb67bfb643 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -165,9 +165,8 @@ public function renderView($view, array $parameters = array())
     /**
      * Renders a view.
      *
-     * @param string   $view       The view name
-     * @param array    $parameters An array of parameters to pass to the view
-     * @param Response $response   A response instance
+     * @param string $view       The view name
+     * @param array  $parameters An array of parameters to pass to the view
      *
      * @return Response A Response instance
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
index 9d060ed43ad3d..27c2c8602a5c9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -34,7 +34,6 @@ class RedirectController extends ContainerAware
      * In case the route name is empty, the status code will be 404 when permanent is false
      * and 410 otherwise.
      *
-     * @param Request    $request          The request instance
      * @param string     $route            The route name to redirect to
      * @param bool       $permanent        Whether the redirection is permanent
      * @param bool|array $ignoreAttributes Whether to ignore attributes or an array of attributes to ignore
@@ -70,7 +69,6 @@ public function redirectAction(Request $request, $route, $permanent = false, $ig
      * In case the path is empty, the status code will be 404 when permanent is false
      * and 410 otherwise.
      *
-     * @param Request     $request   The request instance
      * @param string      $path      The absolute path or URL to redirect to
      * @param bool        $permanent Whether the redirect is permanent or not
      * @param string|null $scheme    The URL scheme (null to keep the current one)
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
index 244feff00ce7b..13c9df206da6a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
+++ b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
@@ -29,8 +29,7 @@ abstract class HttpCache extends BaseHttpCache
     protected $kernel;
 
     /**
-     * @param HttpKernelInterface $kernel   An HttpKernelInterface instance
-     * @param string              $cacheDir The cache directory (default used if null)
+     * @param string $cacheDir The cache directory (default used if null)
      */
     public function __construct(HttpKernelInterface $kernel, $cacheDir = null)
     {
@@ -43,9 +42,8 @@ public function __construct(HttpKernelInterface $kernel, $cacheDir = null)
     /**
      * Forwards the Request to the backend and returns the Response.
      *
-     * @param Request  $request A Request instance
-     * @param bool     $raw     Whether to catch exceptions or not
-     * @param Response $entry   A Response instance (the stale entry if present, null otherwise)
+     * @param bool     $raw   Whether to catch exceptions or not
+     * @param Response $entry A Response instance (the stale entry if present, null otherwise)
      *
      * @return Response A Response instance
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
index 47b279ce8fbe5..c650bf870bae1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
@@ -29,10 +29,8 @@ class Router extends BaseRouter implements WarmableInterface
     private $container;
 
     /**
-     * @param ContainerInterface $container A ContainerInterface instance
-     * @param mixed              $resource  The main resource to load
-     * @param array              $options   An array of options
-     * @param RequestContext     $context   The context
+     * @param mixed $resource The main resource to load
+     * @param array $options  An array of options
      */
     public function __construct(ContainerInterface $container, $resource, array $options = array(), RequestContext $context = null)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
index 909fd14bb7ad6..1746ad909ce06 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -43,7 +43,6 @@ public function getName()
      *
      * The theme format is "<Bundle>:<Controller>".
      *
-     * @param FormView     $view   A FormView instance
      * @param string|array $themes A theme or an array of theme
      */
     public function setTheme(FormView $view, $themes)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
index 01b255ff0827e..b23fad9231b44 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
@@ -27,8 +27,7 @@ class TemplateLocator implements FileLocatorInterface
     private $cacheHits = array();
 
     /**
-     * @param FileLocatorInterface $locator  A FileLocatorInterface instance
-     * @param string               $cacheDir The cache path
+     * @param string $cacheDir The cache path
      */
     public function __construct(FileLocatorInterface $locator, $cacheDir = null)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
index cb813c61d62ac..f7f62d99858e1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
@@ -98,7 +98,6 @@ public function testGetUserWithEmptyContainer()
     }
 
     /**
-     * @param $token
      *
      * @return ContainerInterface
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
index 6258878e50d56..914159cf3cbab 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
@@ -186,8 +186,7 @@ private function getValue(\Iterator $tokenIterator)
     /**
      * Extracts trans message from PHP tokens.
      *
-     * @param array            $tokens
-     * @param MessageCatalogue $catalog
+     * @param array $tokens
      */
     protected function parseTokens($tokens, MessageCatalogue $catalog)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php b/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php
index 16758d2209fe9..56446e189682e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php
@@ -32,8 +32,7 @@ class TranslationLoader
     /**
      * Adds a loader to the translation extractor.
      *
-     * @param string          $format The format of the loader
-     * @param LoaderInterface $loader
+     * @param string $format The format of the loader
      */
     public function addLoader($format, LoaderInterface $loader)
     {
@@ -43,8 +42,7 @@ public function addLoader($format, LoaderInterface $loader)
     /**
      * Loads translation messages from a directory to the catalogue.
      *
-     * @param string           $directory The directory to look into
-     * @param MessageCatalogue $catalogue The catalogue
+     * @param string $directory The directory to look into
      */
     public function loadMessages($directory, MessageCatalogue $catalogue)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
index 9fdfb645d372a..0a8510b4683a1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -50,14 +50,13 @@ class Translator extends BaseTranslator implements WarmableInterface
      *
      * Available options:
      *
-     *   * cache_dir: The cache directory (or null to disable caching)
-     *   * debug:     Whether to enable debugging or not (false by default)
-     *   * resource_files: List of translation resources available grouped by locale.
+     * * cache_dir: The cache directory (or null to disable caching)
+     * * 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 MessageSelector    $selector  The message selector for pluralization
-     * @param array              $loaderIds An array of loader Ids
-     * @param array              $options   An array of options
+     * @param MessageSelector $selector  The message selector for pluralization
+     * @param array           $loaderIds An array of loader Ids
+     * @param array           $options   An array of options
      *
      * @throws \InvalidArgumentException
      */
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
index f415642801142..3a769e87172f2 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
@@ -98,10 +98,9 @@ final public function addOption($name, $default = null)
      * Subclasses must return the id of a service which implements the
      * AuthenticationProviderInterface.
      *
-     * @param ContainerBuilder $container
-     * @param string           $id             The unique id of the firewall
-     * @param array            $config         The options array for this listener
-     * @param string           $userProviderId The id of the user provider
+     * @param string $id             The unique id of the firewall
+     * @param array  $config         The options array for this listener
+     * @param string $userProviderId The id of the user provider
      *
      * @return string never null, the id of the authentication provider
      */
diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
index 4a83c842a382b..f95703f13a1a5 100644
--- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
+++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
@@ -34,8 +34,7 @@ class ExceptionController
     protected $debug;
 
     /**
-     * @param Environment $twig
-     * @param bool        $debug Show error (false) or exception (true) pages by default
+     * @param bool $debug Show error (false) or exception (true) pages by default
      */
     public function __construct(Environment $twig, $debug)
     {
@@ -90,10 +89,9 @@ protected function getAndCleanOutputBuffering($startObLevel)
     }
 
     /**
-     * @param Request $request
-     * @param string  $format
-     * @param int     $code          An HTTP response status code
-     * @param bool    $showException
+     * @param string $format
+     * @param int    $code          An HTTP response status code
+     * @param bool   $showException
      *
      * @return TemplateReferenceInterface
      */
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
index 6793a48bf36bd..2094c8a0337b9 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -34,11 +34,7 @@ class ProfilerController
     private $toolbarPosition;
 
     /**
-     * @param UrlGeneratorInterface $generator       The URL Generator
-     * @param Profiler              $profiler        The profiler
-     * @param Environment           $twig            The twig environment
-     * @param array                 $templates       The templates
-     * @param string                $toolbarPosition The toolbar position (top, bottom, normal, or null -- use the configuration)
+     * @param string $toolbarPosition The toolbar position (top, bottom, normal, or null -- use the configuration)
      */
     public function __construct(UrlGeneratorInterface $generator, Profiler $profiler = null, Environment $twig, array $templates, $toolbarPosition = 'normal')
     {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
index c508346bf68a4..2dbb0ba4120ec 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
@@ -78,8 +78,7 @@ public function panelAction($token)
     /**
      * Returns the routing traces associated to the given request.
      *
-     * @param RequestDataCollector $request
-     * @param string               $method
+     * @param string $method
      *
      * @return array
      */
diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
index 8af7c63e64aaa..b4699963dfa03 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
@@ -34,8 +34,7 @@ class WebProfilerExtension extends Extension
     /**
      * Loads the web profiler configuration.
      *
-     * @param array            $configs   An array of configuration settings
-     * @param ContainerBuilder $container A ContainerBuilder instance
+     * @param array $configs An array of configuration settings
      */
     public function load(array $configs, ContainerBuilder $container)
     {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
index 1e0b42b13d9fb..53ed6f22615d0 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
@@ -42,8 +42,7 @@ public function __construct(Profiler $profiler, Environment $twig, array $templa
     /**
      * Gets the template name for a given panel.
      *
-     * @param Profile $profile
-     * @param string  $panel
+     * @param string $panel
      *
      * @return mixed
      *
diff --git a/src/Symfony/Component/Asset/Packages.php b/src/Symfony/Component/Asset/Packages.php
index 63808d90786c0..79e82cdc218ed 100644
--- a/src/Symfony/Component/Asset/Packages.php
+++ b/src/Symfony/Component/Asset/Packages.php
@@ -26,8 +26,7 @@ class Packages
     private $packages = array();
 
     /**
-     * @param PackageInterface   $defaultPackage The default package
-     * @param PackageInterface[] $packages       Additional packages indexed by name
+     * @param PackageInterface[] $packages Additional packages indexed by name
      */
     public function __construct(PackageInterface $defaultPackage = null, array $packages = array())
     {
@@ -46,8 +45,7 @@ public function setDefaultPackage(PackageInterface $defaultPackage)
     /**
      * Adds a  package.
      *
-     * @param string           $name    The package name
-     * @param PackageInterface $package The package
+     * @param string $name The package name
      */
     public function addPackage($name, PackageInterface $package)
     {
diff --git a/src/Symfony/Component/Asset/PathPackage.php b/src/Symfony/Component/Asset/PathPackage.php
index 5621986fb58b6..252e19a8ab250 100644
--- a/src/Symfony/Component/Asset/PathPackage.php
+++ b/src/Symfony/Component/Asset/PathPackage.php
@@ -29,8 +29,7 @@ class PathPackage extends Package
     private $basePath;
 
     /**
-     * @param string                   $basePath        The base path to be prepended to relative paths
-     * @param VersionStrategyInterface $versionStrategy The version strategy
+     * @param string $basePath The base path to be prepended to relative paths
      */
     public function __construct($basePath, VersionStrategyInterface $versionStrategy, ContextInterface $context = null)
     {
diff --git a/src/Symfony/Component/Asset/UrlPackage.php b/src/Symfony/Component/Asset/UrlPackage.php
index 782b2ddfce93b..646784bf58ef5 100644
--- a/src/Symfony/Component/Asset/UrlPackage.php
+++ b/src/Symfony/Component/Asset/UrlPackage.php
@@ -39,9 +39,8 @@ class UrlPackage extends Package
     private $sslPackage;
 
     /**
-     * @param string|string[]          $baseUrls        Base asset URLs
-     * @param VersionStrategyInterface $versionStrategy The version strategy
-     * @param ContextInterface|null    $context         Context
+     * @param string|string[]       $baseUrls Base asset URLs
+     * @param ContextInterface|null $context  Context
      */
     public function __construct($baseUrls, VersionStrategyInterface $versionStrategy, ContextInterface $context = null)
     {
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
index 675a608d8dccf..2381bae809dc1 100644
--- a/src/Symfony/Component/BrowserKit/Client.php
+++ b/src/Symfony/Component/BrowserKit/Client.php
@@ -226,7 +226,6 @@ public function click(Link $link)
     /**
      * Submits a form.
      *
-     * @param Form  $form   A Form instance
      * @param array $values An array of form field values
      *
      * @return Crawler
@@ -244,7 +243,6 @@ public function submit(Form $form, array $values = array())
      * @param string $method        The request method
      * @param string $uri           The URI to fetch
      * @param array  $parameters    The Request parameters
-     * @param array  $files         The files
      * @param array  $server        The server parameters (HTTP headers are referenced with a HTTP_ prefix as PHP does)
      * @param string $content       The raw body data
      * @param bool   $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())
@@ -540,8 +538,7 @@ protected function getAbsoluteUri($uri)
     /**
      * Makes a request from a Request object directly.
      *
-     * @param Request $request       A Request instance
-     * @param bool    $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())
+     * @param bool $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())
      *
      * @return Crawler
      */
diff --git a/src/Symfony/Component/ClassLoader/UniversalClassLoader.php b/src/Symfony/Component/ClassLoader/UniversalClassLoader.php
index a62f6ceac822d..1db4f1b2b1599 100644
--- a/src/Symfony/Component/ClassLoader/UniversalClassLoader.php
+++ b/src/Symfony/Component/ClassLoader/UniversalClassLoader.php
@@ -43,7 +43,6 @@
  *         'Swift_' => __DIR__.'/Swift',
  *     ));
  *
- *
  *     // to enable searching the include path (e.g. for PEAR packages)
  *     $loader->useIncludePath(true);
  *
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
index 2e346d79072ed..60942ce0e49e9 100644
--- a/src/Symfony/Component/Config/Definition/BaseNode.php
+++ b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -265,9 +265,7 @@ final public function normalize($value)
     /**
      * Normalizes the value before any other normalization is applied.
      *
-     * @param $value
-     *
-     * @return $value The normalized array value
+     * @return The normalized array value
      */
     protected function preNormalize($value)
     {
diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
index c3b2fcdea3bd1..4a04e93cf7509 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
@@ -42,10 +42,9 @@ public function dumpNode(NodeInterface $node, $namespace = null)
     }
 
     /**
-     * @param NodeInterface $node
-     * @param int           $depth
-     * @param bool          $root      If the node is the root node
-     * @param string        $namespace The namespace of the node
+     * @param int    $depth
+     * @param bool   $root      If the node is the root node
+     * @param string $namespace The namespace of the node
      */
     private function writeNode(NodeInterface $node, $depth = 0, $root = false, $namespace = null)
     {
diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
index 2b103d9533b09..439e768d5f519 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -43,8 +43,7 @@ public function dumpNode(NodeInterface $node)
     }
 
     /**
-     * @param NodeInterface $node
-     * @param int           $depth
+     * @param int $depth
      */
     private function writeNode(NodeInterface $node, $depth = 0)
     {
diff --git a/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
index 1a5de41ccb01f..32fe29051a1a5 100644
--- a/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
@@ -262,7 +262,6 @@ protected function getPrototypeNodeWithDefaultChildren()
      *     )
      * )
      *
-     *
      * @dataProvider getDataForKeyRemovedLeftValueOnly
      */
     public function testMappedAttributeKeyIsRemovedLeftValueOnly($value, $children, $expected)
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
index c7c3157180221..ef1b225ed4c9d 100644
--- a/src/Symfony/Component/Config/Util/XmlUtils.php
+++ b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -113,18 +113,17 @@ public static function loadFile($file, $schemaOrCallable = null)
      *
      * The following rules applies during the conversion:
      *
-     *  * Each tag is converted to a key value or an array
-     *    if there is more than one "value"
+     * * Each tag is converted to a key value or an array
+     *   if there is more than one "value"
      *
-     *  * The content of a tag is set under a "value" key (<foo>bar</foo>)
-     *    if the tag also has some nested tags
+     * * The content of a tag is set under a "value" key (<foo>bar</foo>)
+     *   if the tag also has some nested tags
      *
-     *  * The attributes are converted to keys (<foo foo="bar"/>)
+     * * The attributes are converted to keys (<foo foo="bar"/>)
      *
-     *  * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
+     * * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
      *
-     * @param \DOMElement $element     A \DOMElement instance
-     * @param bool        $checkPrefix Check prefix in an element or an attribute name
+     * @param bool $checkPrefix Check prefix in an element or an attribute name
      *
      * @return array A PHP array
      */
diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
index 177a054cc18d1..170b68599165a 100644
--- a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
@@ -80,7 +80,6 @@ public function getCommandDocument(Command $command)
     }
 
     /**
-     * @param Application $application
      * @param string|null $namespace
      *
      * @return \DOMDocument
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index 17fffe509a942..ca7a9d0a0ca60 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -47,9 +47,7 @@ public function __construct()
      * * format: string, the output format name
      * * raw_text: boolean, sets output type as raw
      *
-     * @param OutputInterface $output
-     * @param object          $object
-     * @param array           $options
+     * @param object $object
      *
      * @throws \InvalidArgumentException when the given format is not supported
      */
@@ -71,8 +69,7 @@ public function describe(OutputInterface $output, $object, array $options = arra
     /**
      * Registers a descriptor.
      *
-     * @param string              $format
-     * @param DescriptorInterface $descriptor
+     * @param string $format
      *
      * @return $this
      */
diff --git a/src/Symfony/Component/Console/Helper/DialogHelper.php b/src/Symfony/Component/Console/Helper/DialogHelper.php
index 0a5939a6d36fa..bcb93583e9dd4 100644
--- a/src/Symfony/Component/Console/Helper/DialogHelper.php
+++ b/src/Symfony/Component/Console/Helper/DialogHelper.php
@@ -39,13 +39,12 @@ public function __construct($triggerDeprecationError = true)
     /**
      * Asks the user to select a value.
      *
-     * @param OutputInterface $output       An Output instance
-     * @param string|array    $question     The question to ask
-     * @param array           $choices      List of choices to pick from
-     * @param bool|string     $default      The default answer if the user enters nothing
-     * @param bool|int        $attempts     Max number of times to ask before giving up (false by default, which means infinite)
-     * @param string          $errorMessage Message which will be shown if invalid value from choice list would be picked
-     * @param bool            $multiselect  Select more than one value separated by comma
+     * @param string|array $question     The question to ask
+     * @param array        $choices      List of choices to pick from
+     * @param bool|string  $default      The default answer if the user enters nothing
+     * @param bool|int     $attempts     Max number of times to ask before giving up (false by default, which means infinite)
+     * @param string       $errorMessage Message which will be shown if invalid value from choice list would be picked
+     * @param bool         $multiselect  Select more than one value separated by comma
      *
      * @return int|string|array The selected value or values (the key of the choices array)
      *
@@ -102,10 +101,9 @@ public function select(OutputInterface $output, $question, $choices, $default =
     /**
      * Asks a question to the user.
      *
-     * @param OutputInterface $output       An Output instance
-     * @param string|array    $question     The question to ask
-     * @param string          $default      The default answer if none is given by the user
-     * @param array           $autocomplete List of values to autocomplete
+     * @param string|array $question     The question to ask
+     * @param string       $default      The default answer if none is given by the user
+     * @param array        $autocomplete List of values to autocomplete
      *
      * @return string The user answer
      *
@@ -245,9 +243,8 @@ public function ask(OutputInterface $output, $question, $default = null, array $
      *
      * The question will be asked until the user answers by nothing, yes, or no.
      *
-     * @param OutputInterface $output   An Output instance
-     * @param string|array    $question The question to ask
-     * @param bool            $default  The default answer if the user enters nothing
+     * @param string|array $question The question to ask
+     * @param bool         $default  The default answer if the user enters nothing
      *
      * @return bool true if the user has confirmed, false otherwise
      */
@@ -268,9 +265,8 @@ public function askConfirmation(OutputInterface $output, $question, $default = t
     /**
      * Asks a question to the user, the response is hidden.
      *
-     * @param OutputInterface $output   An Output instance
-     * @param string|array    $question The question
-     * @param bool            $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not
+     * @param string|array $question The question
+     * @param bool         $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not
      *
      * @return string The answer
      *
@@ -346,12 +342,11 @@ public function askHiddenResponse(OutputInterface $output, $question, $fallback
      * validated data when the data is valid and throw an exception
      * otherwise.
      *
-     * @param OutputInterface $output       An Output instance
-     * @param string|array    $question     The question to ask
-     * @param callable        $validator    A PHP callback
-     * @param int|false       $attempts     Max number of times to ask before giving up (false by default, which means infinite)
-     * @param string          $default      The default answer if none is given by the user
-     * @param array           $autocomplete List of values to autocomplete
+     * @param string|array $question     The question to ask
+     * @param callable     $validator    A PHP callback
+     * @param int|bool     $attempts     Max number of times to ask before giving up (false by default, which means infinite)
+     * @param string       $default      The default answer if none is given by the user
+     * @param array        $autocomplete List of values to autocomplete
      *
      * @return mixed
      *
@@ -375,11 +370,10 @@ public function askAndValidate(OutputInterface $output, $question, $validator, $
      * validated data when the data is valid and throw an exception
      * otherwise.
      *
-     * @param OutputInterface $output    An Output instance
-     * @param string|array    $question  The question to ask
-     * @param callable        $validator A PHP callback
-     * @param int|false       $attempts  Max number of times to ask before giving up (false by default, which means infinite)
-     * @param bool            $fallback  In case the response can not be hidden, whether to fallback on non-hidden question or not
+     * @param string|array $question  The question to ask
+     * @param callable     $validator A PHP callback
+     * @param int|bool     $attempts  Max number of times to ask before giving up (false by default, which means infinite)
+     * @param bool         $fallback  In case the response can not be hidden, whether to fallback on non-hidden question or not
      *
      * @return string The response
      *
@@ -468,10 +462,9 @@ private function hasSttyAvailable()
     /**
      * Validate an attempt.
      *
-     * @param callable        $interviewer A callable that will ask for a question and return the result
-     * @param OutputInterface $output      An Output instance
-     * @param callable        $validator   A PHP callback
-     * @param int|false       $attempts    Max number of times to ask before giving up; false will ask infinitely
+     * @param callable $interviewer A callable that will ask for a question and return the result
+     * @param callable $validator   A PHP callback
+     * @param int|bool $attempts    Max number of times to ask before giving up; false will ask infinitely
      *
      * @return string The validated response
      *
diff --git a/src/Symfony/Component/Console/Helper/HelperSet.php b/src/Symfony/Component/Console/Helper/HelperSet.php
index 6ae1627938295..2cccb82f9dde7 100644
--- a/src/Symfony/Component/Console/Helper/HelperSet.php
+++ b/src/Symfony/Component/Console/Helper/HelperSet.php
@@ -39,8 +39,7 @@ public function __construct(array $helpers = array())
     /**
      * Sets a helper.
      *
-     * @param HelperInterface $helper The helper instance
-     * @param string          $alias  An alias
+     * @param string $alias An alias
      */
     public function set(HelperInterface $helper, $alias = null)
     {
diff --git a/src/Symfony/Component/Console/Helper/ProcessHelper.php b/src/Symfony/Component/Console/Helper/ProcessHelper.php
index a811eb48e6798..ef31534eeeafa 100644
--- a/src/Symfony/Component/Console/Helper/ProcessHelper.php
+++ b/src/Symfony/Component/Console/Helper/ProcessHelper.php
@@ -27,7 +27,6 @@ class ProcessHelper extends Helper
     /**
      * Runs an external process.
      *
-     * @param OutputInterface      $output    An OutputInterface instance
      * @param string|array|Process $cmd       An instance of Process or an array of arguments to escape and run or a command to run
      * @param string|null          $error     An error message that must be displayed if something went wrong
      * @param callable|null        $callback  A PHP callback to run whenever there is some
@@ -80,11 +79,10 @@ public function run(OutputInterface $output, $cmd, $error = null, $callback = nu
      * This is identical to run() except that an exception is thrown if the process
      * exits with a non-zero exit code.
      *
-     * @param OutputInterface $output   An OutputInterface instance
-     * @param string|Process  $cmd      An instance of Process or a command to run
-     * @param string|null     $error    An error message that must be displayed if something went wrong
-     * @param callable|null   $callback A PHP callback to run whenever there is some
-     *                                  output available on STDOUT or STDERR
+     * @param string|Process $cmd      An instance of Process or a command to run
+     * @param string|null    $error    An error message that must be displayed if something went wrong
+     * @param callable|null  $callback A PHP callback to run whenever there is some
+     *                                 output available on STDOUT or STDERR
      *
      * @return Process The process that ran
      *
@@ -107,7 +105,6 @@ public function mustRun(OutputInterface $output, $cmd, $error = null, $callback
      * Wraps a Process callback to add debugging output.
      *
      * @param OutputInterface $output   An OutputInterface interface
-     * @param Process         $process  The Process
      * @param callable|null   $callback A PHP callable
      *
      * @return callable
diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
index 4d4c0e31e20c1..704bfd4238a74 100644
--- a/src/Symfony/Component/Console/Helper/ProgressBar.php
+++ b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -44,8 +44,7 @@ class ProgressBar
     private static $formats;
 
     /**
-     * @param OutputInterface $output An OutputInterface instance
-     * @param int             $max    Maximum steps (0 if unknown)
+     * @param int $max Maximum steps (0 if unknown)
      */
     public function __construct(OutputInterface $output, $max = 0)
     {
diff --git a/src/Symfony/Component/Console/Helper/ProgressHelper.php b/src/Symfony/Component/Console/Helper/ProgressHelper.php
index 20b34687f8e87..a38439b3e98c2 100644
--- a/src/Symfony/Component/Console/Helper/ProgressHelper.php
+++ b/src/Symfony/Component/Console/Helper/ProgressHelper.php
@@ -189,8 +189,7 @@ public function setRedrawFrequency($freq)
     /**
      * Starts the progress output.
      *
-     * @param OutputInterface $output An Output instance
-     * @param int|null        $max    Maximum steps
+     * @param int|null $max Maximum steps
      */
     public function start(OutputInterface $output, $max = null)
     {
@@ -439,8 +438,7 @@ private function humaneTime($secs)
     /**
      * Overwrites a previous message to the output.
      *
-     * @param OutputInterface $output  An Output instance
-     * @param string          $message The message
+     * @param string $message The message
      */
     private function overwrite(OutputInterface $output, $message)
     {
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index bce0534ed0991..5a74bccf29ea6 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -193,10 +193,7 @@ protected function writeError(OutputInterface $output, \Exception $error)
     /**
      * Autocompletes a question.
      *
-     * @param OutputInterface $output
-     * @param Question        $question
-     * @param resource        $inputStream
-     * @param array           $autocomplete
+     * @param resource $inputStream
      *
      * @return string
      */
@@ -312,8 +309,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
     /**
      * Gets a hidden response from user.
      *
-     * @param OutputInterface $output      An Output instance
-     * @param resource        $inputStream The handler resource
+     * @param resource $inputStream The handler resource
      *
      * @return string The answer
      *
@@ -373,9 +369,7 @@ private function getHiddenResponse(OutputInterface $output, $inputStream)
     /**
      * Validates an attempt.
      *
-     * @param callable        $interviewer A callable that will ask for a question and return the result
-     * @param OutputInterface $output      An Output instance
-     * @param Question        $question    A Question instance
+     * @param callable $interviewer A callable that will ask for a question and return the result
      *
      * @return mixed The validated response
      *
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
index 15ad1edc48683..94249a587a866 100644
--- a/src/Symfony/Component/Console/Helper/Table.php
+++ b/src/Symfony/Component/Console/Helper/Table.php
@@ -70,8 +70,7 @@ public function __construct(OutputInterface $output)
     /**
      * Sets a style definition.
      *
-     * @param string     $name  The style name
-     * @param TableStyle $style A TableStyle instance
+     * @param string $name The style name
      */
     public static function setStyleDefinition($name, TableStyle $style)
     {
@@ -255,7 +254,6 @@ private function renderColumnSeparator()
      *
      * Example: <code>| 9971-5-0210-0 | A Tale of Two Cities  | Charles Dickens  |</code>
      *
-     * @param array  $row
      * @param string $cellFormat
      */
     private function renderRow(array $row, $cellFormat)
@@ -275,7 +273,6 @@ private function renderRow(array $row, $cellFormat)
     /**
      * Renders table cell with padding.
      *
-     * @param array  $row
      * @param int    $column
      * @param string $cellFormat
      */
@@ -365,8 +362,7 @@ private function buildTableRows($rows)
     /**
      * fill rows that contains rowspan > 1.
      *
-     * @param array $rows
-     * @param int   $line
+     * @param int $line
      *
      * @return array
      */
@@ -440,8 +436,7 @@ private function fillCells($row)
     }
 
     /**
-     * @param array $rows
-     * @param int   $line
+     * @param int $line
      *
      * @return array
      */
@@ -543,8 +538,7 @@ private function getColumnSeparatorWidth()
     /**
      * Gets cell width.
      *
-     * @param array $row
-     * @param int   $column
+     * @param int $column
      *
      * @return int
      */
diff --git a/src/Symfony/Component/Console/Helper/TableCell.php b/src/Symfony/Component/Console/Helper/TableCell.php
index 8562f72fe23d0..195fef2283ca0 100644
--- a/src/Symfony/Component/Console/Helper/TableCell.php
+++ b/src/Symfony/Component/Console/Helper/TableCell.php
@@ -24,7 +24,6 @@ class TableCell
 
     /**
      * @param string $value
-     * @param array  $options
      */
     public function __construct($value = '', array $options = array())
     {
diff --git a/src/Symfony/Component/Console/Input/StringInput.php b/src/Symfony/Component/Console/Input/StringInput.php
index 754d712cc33eb..c09a89bfb5c46 100644
--- a/src/Symfony/Component/Console/Input/StringInput.php
+++ b/src/Symfony/Component/Console/Input/StringInput.php
@@ -26,8 +26,7 @@ class StringInput extends ArgvInput
     const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\')';
 
     /**
-     * @param string          $input      A string representing the parameters from the CLI
-     * @param InputDefinition $definition A InputDefinition instance
+     * @param string $input A string representing the parameters from the CLI
      *
      * @deprecated The second argument is deprecated as it does not work (will be removed in 3.0), use 'bind' method instead
      */
diff --git a/src/Symfony/Component/Console/Logger/ConsoleLogger.php b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
index d1aba10ac0d46..ceebe711100de 100644
--- a/src/Symfony/Component/Console/Logger/ConsoleLogger.php
+++ b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
@@ -85,7 +85,6 @@ public function log($level, $message, array $context = array())
      * @author PHP Framework Interoperability Group
      *
      * @param string $message
-     * @param array  $context
      *
      * @return string
      */
diff --git a/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php b/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
index cb3158a5536dc..1200c979ea6ac 100644
--- a/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
+++ b/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
@@ -25,7 +25,6 @@ class SyntaxErrorException extends ParseException
 {
     /**
      * @param string $expectedValue
-     * @param Token  $foundToken
      *
      * @return self
      */
diff --git a/src/Symfony/Component/CssSelector/Node/AttributeNode.php b/src/Symfony/Component/CssSelector/Node/AttributeNode.php
index ae327d1f8d03b..56fc96380ccb5 100644
--- a/src/Symfony/Component/CssSelector/Node/AttributeNode.php
+++ b/src/Symfony/Component/CssSelector/Node/AttributeNode.php
@@ -28,11 +28,10 @@ class AttributeNode extends AbstractNode
     private $value;
 
     /**
-     * @param NodeInterface $selector
-     * @param string        $namespace
-     * @param string        $attribute
-     * @param string        $operator
-     * @param string        $value
+     * @param string $namespace
+     * @param string $attribute
+     * @param string $operator
+     * @param string $value
      */
     public function __construct(NodeInterface $selector, $namespace, $attribute, $operator, $value)
     {
diff --git a/src/Symfony/Component/CssSelector/Node/ClassNode.php b/src/Symfony/Component/CssSelector/Node/ClassNode.php
index 1ff2ee3549e61..0e121ca9e6b8b 100644
--- a/src/Symfony/Component/CssSelector/Node/ClassNode.php
+++ b/src/Symfony/Component/CssSelector/Node/ClassNode.php
@@ -25,8 +25,7 @@ class ClassNode extends AbstractNode
     private $name;
 
     /**
-     * @param NodeInterface $selector
-     * @param string        $name
+     * @param string $name
      */
     public function __construct(NodeInterface $selector, $name)
     {
diff --git a/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php b/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
index f29867e49bd17..e70e4f61c910d 100644
--- a/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
+++ b/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
@@ -26,9 +26,7 @@ class CombinedSelectorNode extends AbstractNode
     private $subSelector;
 
     /**
-     * @param NodeInterface $selector
-     * @param string        $combinator
-     * @param NodeInterface $subSelector
+     * @param string $combinator
      */
     public function __construct(NodeInterface $selector, $combinator, NodeInterface $subSelector)
     {
diff --git a/src/Symfony/Component/CssSelector/Node/FunctionNode.php b/src/Symfony/Component/CssSelector/Node/FunctionNode.php
index 08931d3560f86..554b61292785c 100644
--- a/src/Symfony/Component/CssSelector/Node/FunctionNode.php
+++ b/src/Symfony/Component/CssSelector/Node/FunctionNode.php
@@ -28,9 +28,8 @@ class FunctionNode extends AbstractNode
     private $arguments;
 
     /**
-     * @param NodeInterface $selector
-     * @param string        $name
-     * @param Token[]       $arguments
+     * @param string  $name
+     * @param Token[] $arguments
      */
     public function __construct(NodeInterface $selector, $name, array $arguments = array())
     {
diff --git a/src/Symfony/Component/CssSelector/Node/HashNode.php b/src/Symfony/Component/CssSelector/Node/HashNode.php
index eb24ae2f5952b..24dd33ea56ee6 100644
--- a/src/Symfony/Component/CssSelector/Node/HashNode.php
+++ b/src/Symfony/Component/CssSelector/Node/HashNode.php
@@ -25,8 +25,7 @@ class HashNode extends AbstractNode
     private $id;
 
     /**
-     * @param NodeInterface $selector
-     * @param string        $id
+     * @param string $id
      */
     public function __construct(NodeInterface $selector, $id)
     {
diff --git a/src/Symfony/Component/CssSelector/Node/PseudoNode.php b/src/Symfony/Component/CssSelector/Node/PseudoNode.php
index d888c254a190f..aeb9a8239f440 100644
--- a/src/Symfony/Component/CssSelector/Node/PseudoNode.php
+++ b/src/Symfony/Component/CssSelector/Node/PseudoNode.php
@@ -25,8 +25,7 @@ class PseudoNode extends AbstractNode
     private $identifier;
 
     /**
-     * @param NodeInterface $selector
-     * @param string        $identifier
+     * @param string $identifier
      */
     public function __construct(NodeInterface $selector, $identifier)
     {
diff --git a/src/Symfony/Component/CssSelector/Node/SelectorNode.php b/src/Symfony/Component/CssSelector/Node/SelectorNode.php
index bb9ef2871408d..990a2fe28bbcd 100644
--- a/src/Symfony/Component/CssSelector/Node/SelectorNode.php
+++ b/src/Symfony/Component/CssSelector/Node/SelectorNode.php
@@ -25,8 +25,7 @@ class SelectorNode extends AbstractNode
     private $pseudoElement;
 
     /**
-     * @param NodeInterface $tree
-     * @param null|string   $pseudoElement
+     * @param null|string $pseudoElement
      */
     public function __construct(NodeInterface $tree, $pseudoElement = null)
     {
diff --git a/src/Symfony/Component/CssSelector/Parser/Parser.php b/src/Symfony/Component/CssSelector/Parser/Parser.php
index 861338235a2a5..999f2f19d3208 100644
--- a/src/Symfony/Component/CssSelector/Parser/Parser.php
+++ b/src/Symfony/Component/CssSelector/Parser/Parser.php
@@ -156,8 +156,7 @@ private function parserSelectorNode(TokenStream $stream)
     /**
      * Parses next simple node (hash, class, pseudo, negation).
      *
-     * @param TokenStream $stream
-     * @param bool        $insideNegation
+     * @param bool $insideNegation
      *
      * @return array
      *
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
index cbe48c57a9a37..6a54d85569d68 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
@@ -42,9 +42,8 @@ public function getAttributeMatchingTranslators()
     }
 
     /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
+     * @param string $attribute
+     * @param string $value
      *
      * @return XPathExpr
      */
@@ -54,9 +53,8 @@ public function translateExists(XPathExpr $xpath, $attribute, $value)
     }
 
     /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
+     * @param string $attribute
+     * @param string $value
      *
      * @return XPathExpr
      */
@@ -66,9 +64,8 @@ public function translateEquals(XPathExpr $xpath, $attribute, $value)
     }
 
     /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
+     * @param string $attribute
+     * @param string $value
      *
      * @return XPathExpr
      */
@@ -82,9 +79,8 @@ public function translateIncludes(XPathExpr $xpath, $attribute, $value)
     }
 
     /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
+     * @param string $attribute
+     * @param string $value
      *
      * @return XPathExpr
      */
@@ -99,9 +95,8 @@ public function translateDashMatch(XPathExpr $xpath, $attribute, $value)
     }
 
     /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
+     * @param string $attribute
+     * @param string $value
      *
      * @return XPathExpr
      */
@@ -115,9 +110,8 @@ public function translatePrefixMatch(XPathExpr $xpath, $attribute, $value)
     }
 
     /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
+     * @param string $attribute
+     * @param string $value
      *
      * @return XPathExpr
      */
@@ -132,9 +126,8 @@ public function translateSuffixMatch(XPathExpr $xpath, $attribute, $value)
     }
 
     /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
+     * @param string $attribute
+     * @param string $value
      *
      * @return XPathExpr
      */
@@ -148,9 +141,8 @@ public function translateSubstringMatch(XPathExpr $xpath, $attribute, $value)
     }
 
     /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
+     * @param string $attribute
+     * @param string $value
      *
      * @return XPathExpr
      */
diff --git a/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php b/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
index 73567b27a1634..3fe141a70e654 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
@@ -44,10 +44,8 @@ public function getFunctionTranslators()
     }
 
     /**
-     * @param XPathExpr    $xpath
-     * @param FunctionNode $function
-     * @param bool         $last
-     * @param bool         $addNameTest
+     * @param bool $last
+     * @param bool $addNameTest
      *
      * @return XPathExpr
      *
diff --git a/src/Symfony/Component/CssSelector/XPath/Translator.php b/src/Symfony/Component/CssSelector/XPath/Translator.php
index 74c30dcbb9c70..32f095ae17ab2 100644
--- a/src/Symfony/Component/CssSelector/XPath/Translator.php
+++ b/src/Symfony/Component/CssSelector/XPath/Translator.php
@@ -178,9 +178,7 @@ public function nodeToXPath(NodeInterface $node)
     }
 
     /**
-     * @param string        $combiner
-     * @param NodeInterface $xpath
-     * @param NodeInterface $combinedXpath
+     * @param string $combiner
      *
      * @return XPathExpr
      *
@@ -210,8 +208,7 @@ public function addFunction(XPathExpr $xpath, FunctionNode $function)
     }
 
     /**
-     * @param XPathExpr $xpath
-     * @param string    $pseudoClass
+     * @param string $pseudoClass
      *
      * @return XPathExpr
      *
@@ -227,10 +224,9 @@ public function addPseudoClass(XPathExpr $xpath, $pseudoClass)
     }
 
     /**
-     * @param XPathExpr $xpath
-     * @param string    $operator
-     * @param string    $attribute
-     * @param string    $value
+     * @param string $operator
+     * @param string $attribute
+     * @param string $value
      *
      * @return XPathExpr
      *
diff --git a/src/Symfony/Component/CssSelector/XPath/XPathExpr.php b/src/Symfony/Component/CssSelector/XPath/XPathExpr.php
index c0d2bd55a5a03..5fb507620bb22 100644
--- a/src/Symfony/Component/CssSelector/XPath/XPathExpr.php
+++ b/src/Symfony/Component/CssSelector/XPath/XPathExpr.php
@@ -51,7 +51,6 @@ public function getElement()
     }
 
     /**
-     * @param $condition
      *
      * @return $this
      */
@@ -96,8 +95,7 @@ public function addStarPrefix()
     /**
      * Joins another XPathExpr with a combiner.
      *
-     * @param string    $combiner
-     * @param XPathExpr $expr
+     * @param string $combiner
      *
      * @return $this
      */
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
index 6a15f7b368307..237455d7637eb 100644
--- a/src/Symfony/Component/Debug/ErrorHandler.php
+++ b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -732,8 +732,7 @@ public function setDisplayErrors($displayErrors)
     /**
      * Sets a logger for the given channel.
      *
-     * @param LoggerInterface $logger  A logger interface
-     * @param string          $channel The channel associated with the logger (deprecation, emergency or scream)
+     * @param string $channel The channel associated with the logger (deprecation, emergency or scream)
      *
      * @deprecated since version 2.6, to be removed in 3.0. Use setLoggers() or setDefaultLogger() instead.
      */
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
index dd9539eeb7cea..a212f4a903e61 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
@@ -65,8 +65,7 @@ public function getLoggingFormatter()
     /**
      * Adds a pass to the PassConfig.
      *
-     * @param CompilerPassInterface $pass A compiler pass
-     * @param string                $type The type of the pass
+     * @param string $type The type of the pass
      */
     public function addPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
index 78f0ebb41f68c..9e3146a73f8e8 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -71,8 +71,7 @@ public function process(ContainerBuilder $container)
     /**
      * Processes inline arguments.
      *
-     * @param ContainerBuilder $container The ContainerBuilder
-     * @param array            $arguments An array of arguments
+     * @param array $arguments An array of arguments
      *
      * @return array
      */
@@ -108,9 +107,7 @@ private function inlineArguments(ContainerBuilder $container, array $arguments)
     /**
      * Checks if the definition is inlineable.
      *
-     * @param ContainerBuilder $container
-     * @param string           $id
-     * @param Definition       $definition
+     * @param string $id
      *
      * @return bool If the definition is inlineable
      */
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index 8cf78479ec5fc..c9c8bc82f9e95 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -86,8 +86,7 @@ public function getPasses()
     /**
      * Adds a pass.
      *
-     * @param CompilerPassInterface $pass A Compiler pass
-     * @param string                $type The pass type
+     * @param string $type The pass type
      *
      * @throws InvalidArgumentException when a pass type doesn't exist
      */
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
index e923f01c3e265..a704f63209f06 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
@@ -52,8 +52,7 @@ public function process(ContainerBuilder $container)
     /**
      * Resolves the definition.
      *
-     * @param string              $id         The definition identifier
-     * @param DefinitionDecorator $definition
+     * @param string $id The definition identifier
      *
      * @return Definition
      *
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php
index 7e8cf812f7082..7191d7f687ef4 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php
@@ -25,9 +25,7 @@ class ServiceReferenceGraphEdge
     private $value;
 
     /**
-     * @param ServiceReferenceGraphNode $sourceNode
-     * @param ServiceReferenceGraphNode $destNode
-     * @param mixed                     $value
+     * @param mixed $value
      */
     public function __construct(ServiceReferenceGraphNode $sourceNode, ServiceReferenceGraphNode $destNode, $value = null)
     {
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 59f8cc7d0dcb9..ee59a34b3f2ae 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -287,8 +287,7 @@ public function loadFromExtension($extension, array $values = array())
     /**
      * Adds a compiler pass.
      *
-     * @param CompilerPassInterface $pass A compiler pass
-     * @param string                $type The type of compiler pass
+     * @param string $type The type of compiler pass
      *
      * @return $this
      */
@@ -691,8 +690,7 @@ public function getAlias($id)
      * This methods allows for simple registration of service definition
      * with a fluid interface.
      *
-     * @param string $id         The service identifier
-     * @param string $class|null The service class
+     * @param string $id The service identifier
      *
      * @return Definition A Definition instance
      */
@@ -737,8 +735,7 @@ public function getDefinitions()
     /**
      * Sets a service definition.
      *
-     * @param string     $id         The service identifier
-     * @param Definition $definition A Definition instance
+     * @param string $id The service identifier
      *
      * @return Definition the service definition
      *
@@ -1097,7 +1094,6 @@ private function callMethod($service, $call, \SplObjectStorage $inlinedDefinitio
     /**
      * Shares a given service in the container.
      *
-     * @param Definition  $definition
      * @param mixed       $service
      * @param string|null $id
      *
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 280eea70a7630..1dc7c2955538e 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -274,8 +274,7 @@ private function addServiceInclude(Definition $definition)
     /**
      * Generates the inline definition of a service.
      *
-     * @param string     $id
-     * @param Definition $definition
+     * @param string $id
      *
      * @return string
      *
@@ -339,8 +338,7 @@ private function addServiceInlinedDefinitions($id, Definition $definition)
     /**
      * Adds the service return statement.
      *
-     * @param string     $id         Service id
-     * @param Definition $definition
+     * @param string $id Service id
      *
      * @return string
      */
@@ -356,8 +354,7 @@ private function addServiceReturn($id, Definition $definition)
     /**
      * Generates the service instance.
      *
-     * @param string     $id
-     * @param Definition $definition
+     * @param string $id
      *
      * @return string
      *
@@ -403,8 +400,7 @@ private function addServiceInstance($id, Definition $definition)
     /**
      * Checks if the definition is a simple instance.
      *
-     * @param string     $id
-     * @param Definition $definition
+     * @param string $id
      *
      * @return bool
      */
@@ -426,8 +422,7 @@ private function isSimpleInstance($id, Definition $definition)
     /**
      * Adds method calls to a service definition.
      *
-     * @param Definition $definition
-     * @param string     $variableName
+     * @param string $variableName
      *
      * @return string
      */
@@ -459,8 +454,7 @@ private function addServiceProperties(Definition $definition, $variableName = 'i
     /**
      * Generates the inline definition setup.
      *
-     * @param string     $id
-     * @param Definition $definition
+     * @param string $id
      *
      * @return string
      *
@@ -504,8 +498,7 @@ private function addServiceInlinedDefinitionsSetup($id, Definition $definition)
     /**
      * Adds configurator definition.
      *
-     * @param Definition $definition
-     * @param string     $variableName
+     * @param string $variableName
      *
      * @return string
      */
@@ -536,8 +529,7 @@ private function addServiceConfigurator(Definition $definition, $variableName =
     /**
      * Adds a service.
      *
-     * @param string     $id
-     * @param Definition $definition
+     * @param string $id
      *
      * @return string
      */
@@ -664,8 +656,7 @@ private function addServices()
     /**
      * Adds synchronizer methods.
      *
-     * @param string     $id         A service identifier
-     * @param Definition $definition A Definition instance
+     * @param string $id A service identifier
      *
      * @return string|null
      *
@@ -1066,7 +1057,6 @@ protected function getDefaultParameters()
     /**
      * Exports parameters.
      *
-     * @param array  $parameters
      * @param string $path
      * @param int    $indent
      *
@@ -1212,9 +1202,7 @@ private function getDefinitionsFromArguments(array $arguments)
      * Checks if a service id has a reference.
      *
      * @param string $id
-     * @param array  $arguments
      * @param bool   $deep
-     * @param array  $visited
      *
      * @return bool
      */
@@ -1413,9 +1401,7 @@ public function dumpParameter($name)
 
     /**
      * @deprecated since version 2.6.2, to be removed in 3.0.
-     *             Use \Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider instead.
-     *
-     * @param ExpressionFunctionProviderInterface $provider
+     * Use \Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider instead.
      */
     public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
     {
@@ -1427,8 +1413,7 @@ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterfac
     /**
      * Gets a service call.
      *
-     * @param string    $id
-     * @param Reference $reference
+     * @param string $id
      *
      * @return string
      */
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
index b3e270057f389..f2191439e3da3 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -87,9 +87,8 @@ private function addMethodCalls(array $methodcalls, \DOMElement $parent)
     /**
      * Adds a service.
      *
-     * @param Definition  $definition
-     * @param string      $id
-     * @param \DOMElement $parent
+     * @param Definition $definition
+     * @param string     $id
      */
     private function addService($definition, $id, \DOMElement $parent)
     {
@@ -203,9 +202,7 @@ private function addService($definition, $id, \DOMElement $parent)
     /**
      * Adds a service alias.
      *
-     * @param string      $alias
-     * @param Alias       $id
-     * @param \DOMElement $parent
+     * @param string $alias
      */
     private function addServiceAlias($alias, Alias $id, \DOMElement $parent)
     {
@@ -243,10 +240,8 @@ private function addServices(\DOMElement $parent)
     /**
      * Converts parameters.
      *
-     * @param array       $parameters
-     * @param string      $type
-     * @param \DOMElement $parent
-     * @param string      $keyAttribute
+     * @param string $type
+     * @param string $keyAttribute
      */
     private function convertParameters(array $parameters, $type, \DOMElement $parent, $keyAttribute = 'key')
     {
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
index 882e93f36bc0b..e8ce83a3b4332 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -50,8 +50,7 @@ public function dump(array $options = array())
     /**
      * Adds a service.
      *
-     * @param string     $id
-     * @param Definition $definition
+     * @param string $id
      *
      * @return string
      */
@@ -157,7 +156,6 @@ private function addService($id, Definition $definition)
      * Adds a service alias.
      *
      * @param string $alias
-     * @param Alias  $id
      *
      * @return string
      */
@@ -267,8 +265,7 @@ private function dumpValue($value)
     /**
      * Gets the service call.
      *
-     * @param string    $id
-     * @param Reference $reference
+     * @param string $id
      *
      * @return string
      */
@@ -301,8 +298,7 @@ private function getExpressionCall($expression)
     /**
      * Prepares parameters.
      *
-     * @param array $parameters
-     * @param bool  $escape
+     * @param bool $escape
      *
      * @return array
      */
diff --git a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
index ab7b86d5acc90..74260313033e2 100644
--- a/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
+++ b/src/Symfony/Component/DependencyInjection/Exception/ParameterNotFoundException.php
@@ -24,11 +24,10 @@ class ParameterNotFoundException extends InvalidArgumentException
     private $alternatives;
 
     /**
-     * @param string     $key          The requested parameter key
-     * @param string     $sourceId     The service id that references the non-existent parameter
-     * @param string     $sourceKey    The parameter key that references the non-existent parameter
-     * @param \Exception $previous     The previous exception
-     * @param string[]   $alternatives Some parameter name alternatives
+     * @param string   $key          The requested parameter key
+     * @param string   $sourceId     The service id that references the non-existent parameter
+     * @param string   $sourceKey    The parameter key that references the non-existent parameter
+     * @param string[] $alternatives Some parameter name alternatives
      */
     public function __construct($key, $sourceId = null, $sourceKey = null, \Exception $previous = null, array $alternatives = array())
     {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 93ca3c669b7d3..1f1b16d91dbf1 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -68,8 +68,6 @@ public function supports($resource, $type = null)
 
     /**
      * Parses parameters.
-     *
-     * @param \DOMDocument $xml
      */
     private function parseParameters(\DOMDocument $xml)
     {
@@ -81,8 +79,7 @@ private function parseParameters(\DOMDocument $xml)
     /**
      * Parses imports.
      *
-     * @param \DOMDocument $xml
-     * @param string       $file
+     * @param string $file
      */
     private function parseImports(\DOMDocument $xml, $file)
     {
@@ -103,8 +100,7 @@ private function parseImports(\DOMDocument $xml, $file)
     /**
      * Parses multiple definitions.
      *
-     * @param \DOMDocument $xml
-     * @param string       $file
+     * @param string $file
      */
     private function parseDefinitions(\DOMDocument $xml, $file)
     {
@@ -125,8 +121,7 @@ private function parseDefinitions(\DOMDocument $xml, $file)
     /**
      * Parses an individual Definition.
      *
-     * @param \DOMElement $service
-     * @param string      $file
+     * @param string $file
      *
      * @return Definition|null
      */
@@ -271,8 +266,7 @@ private function parseFileToDOM($file)
     /**
      * Processes anonymous services.
      *
-     * @param \DOMDocument $xml
-     * @param string       $file
+     * @param string $file
      */
     private function processAnonymousServices(\DOMDocument $xml, $file)
     {
@@ -332,9 +326,8 @@ private function processAnonymousServices(\DOMDocument $xml, $file)
     /**
      * Returns arguments as valid php types.
      *
-     * @param \DOMElement $node
-     * @param string      $name
-     * @param bool        $lowercase
+     * @param string $name
+     * @param bool   $lowercase
      *
      * @return mixed
      */
@@ -405,8 +398,7 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $lowercase = true)
     /**
      * Get child elements by name.
      *
-     * @param \DOMNode $node
-     * @param mixed    $name
+     * @param mixed $name
      *
      * @return array
      */
@@ -425,8 +417,6 @@ private function getChildren(\DOMNode $node, $name)
     /**
      * Validates a documents XML schema.
      *
-     * @param \DOMDocument $dom
-     *
      * @return bool
      *
      * @throws RuntimeException When extension references a non-existent XSD file
@@ -503,8 +493,7 @@ public function validateSchema(\DOMDocument $dom)
     /**
      * Validates an extension.
      *
-     * @param \DOMDocument $dom
-     * @param string       $file
+     * @param string $file
      *
      * @throws InvalidArgumentException When no extension is found corresponding to a tag
      */
@@ -531,8 +520,6 @@ private function validateExtensions(\DOMDocument $dom, $file)
 
     /**
      * Loads from an extension.
-     *
-     * @param \DOMDocument $xml
      */
     private function loadFromExtensions(\DOMDocument $xml)
     {
@@ -555,17 +542,15 @@ private function loadFromExtensions(\DOMDocument $xml)
      *
      * The following rules applies during the conversion:
      *
-     *  * Each tag is converted to a key value or an array
-     *    if there is more than one "value"
-     *
-     *  * The content of a tag is set under a "value" key (<foo>bar</foo>)
-     *    if the tag also has some nested tags
+     * * Each tag is converted to a key value or an array
+     *   if there is more than one "value"
      *
-     *  * The attributes are converted to keys (<foo foo="bar"/>)
+     * * The content of a tag is set under a "value" key (<foo>bar</foo>)
+     *   if the tag also has some nested tags
      *
-     *  * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
+     * * The attributes are converted to keys (<foo foo="bar"/>)
      *
-     * @param \DOMElement $element A \DOMElement instance
+     * * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
      *
      * @return array A PHP array
      */
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index b6b9e93a86ca3..8be39d0b2037e 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -82,7 +82,6 @@ public function supports($resource, $type = null)
     /**
      * Parses all imports.
      *
-     * @param array  $content
      * @param string $file
      */
     private function parseImports(array $content, $file)
@@ -109,7 +108,6 @@ private function parseImports(array $content, $file)
     /**
      * Parses definitions.
      *
-     * @param array  $content
      * @param string $file
      */
     private function parseDefinitions(array $content, $file)
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index cccea633dda3f..ab329f0da8b64 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -253,8 +253,6 @@ public function addXmlContent($content, $charset = 'UTF-8', $options = LIBXML_NO
 
     /**
      * Adds a \DOMDocument to the list of nodes.
-     *
-     * @param \DOMDocument $dom A \DOMDocument instance
      */
     public function addDocument(\DOMDocument $dom)
     {
@@ -265,8 +263,6 @@ public function addDocument(\DOMDocument $dom)
 
     /**
      * Adds a \DOMNodeList to the list of nodes.
-     *
-     * @param \DOMNodeList $nodes A \DOMNodeList instance
      */
     public function addNodeList(\DOMNodeList $nodes)
     {
@@ -291,8 +287,6 @@ public function addNodes(array $nodes)
 
     /**
      * Adds a \DOMNode instance to the list of nodes.
-     *
-     * @param \DOMNode $node A \DOMNode instance
      */
     public function addNode(\DOMNode $node)
     {
@@ -973,8 +967,6 @@ protected function sibling($node, $siblingDir = 'nextSibling')
     }
 
     /**
-     * @param \DOMDocument $document
-     * @param array        $prefixes
      *
      * @return \DOMXPath
      *
@@ -995,8 +987,7 @@ private function createDOMXPath(\DOMDocument $document, array $prefixes = array(
     }
 
     /**
-     * @param \DOMXPath $domxpath
-     * @param string    $prefix
+     * @param string $prefix
      *
      * @return string
      *
diff --git a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
index c479daa75ee78..2ba53222875b6 100644
--- a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
@@ -155,8 +155,6 @@ public function setValue($value)
     /**
      * Adds a choice to the current ones.
      *
-     * @param \DOMElement $node
-     *
      * @throws \LogicException When choice provided is not multiple nor radio
      *
      * @internal
@@ -255,8 +253,6 @@ protected function initialize()
     /**
      * Returns option value with associated disabled flag.
      *
-     * @param \DOMElement $node
-     *
      * @return array
      */
     private function buildOptionValue(\DOMElement $node)
diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
index 54e5fc2b84a3a..a31ac719d7842 100644
--- a/src/Symfony/Component/DomCrawler/Form.php
+++ b/src/Symfony/Component/DomCrawler/Form.php
@@ -37,10 +37,9 @@ class Form extends Link implements \ArrayAccess
     private $baseHref;
 
     /**
-     * @param \DOMElement $node       A \DOMElement instance
-     * @param string      $currentUri The URI of the page where the form is embedded
-     * @param string      $method     The method to use for the link (if null, it defaults to the method defined by the form)
-     * @param string      $baseHref   The URI of the <base> used for relative links, but not for empty action
+     * @param string $currentUri The URI of the page where the form is embedded
+     * @param string $method     The method to use for the link (if null, it defaults to the method defined by the form)
+     * @param string $baseHref   The URI of the <base> used for relative links, but not for empty action
      *
      * @throws \LogicException if the node is not a button inside a form tag
      */
diff --git a/src/Symfony/Component/DomCrawler/Link.php b/src/Symfony/Component/DomCrawler/Link.php
index b68f246b0efd5..43adf0672f070 100644
--- a/src/Symfony/Component/DomCrawler/Link.php
+++ b/src/Symfony/Component/DomCrawler/Link.php
@@ -34,9 +34,8 @@ class Link
     protected $currentUri;
 
     /**
-     * @param \DOMElement $node       A \DOMElement instance
-     * @param string      $currentUri The URI of the page where the link is embedded (or the base href)
-     * @param string      $method     The method to use for the link (get by default)
+     * @param string $currentUri The URI of the page where the link is embedded (or the base href)
+     * @param string $method     The method to use for the link (get by default)
      *
      * @throws \InvalidArgumentException if the node is not a link
      */
@@ -163,8 +162,6 @@ protected function canonicalizePath($path)
     /**
      * Sets current \DOMElement instance.
      *
-     * @param \DOMElement $node A \DOMElement instance
-     *
      * @throws \LogicException If given node is not an anchor
      */
     protected function setNode(\DOMElement $node)
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
index e8e83d3399e02..d6762efde83de 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -203,7 +203,6 @@ public function __call($method, $arguments)
      * Called before dispatching the event.
      *
      * @param string $eventName The event name
-     * @param Event  $event     The event
      */
     protected function preDispatch($eventName, Event $event)
     {
@@ -213,7 +212,6 @@ protected function preDispatch($eventName, Event $event)
      * Called after dispatching the event.
      *
      * @param string $eventName The event name
-     * @param Event  $event     The event
      */
     protected function postDispatch($eventName, Event $event)
     {
diff --git a/src/Symfony/Component/EventDispatcher/Event.php b/src/Symfony/Component/EventDispatcher/Event.php
index 320919ae2faae..2b9c61433849a 100644
--- a/src/Symfony/Component/EventDispatcher/Event.php
+++ b/src/Symfony/Component/EventDispatcher/Event.php
@@ -69,8 +69,6 @@ public function stopPropagation()
     /**
      * Stores the EventDispatcher that dispatches this Event.
      *
-     * @param EventDispatcherInterface $dispatcher
-     *
      * @deprecated since version 2.4, to be removed in 3.0. The event dispatcher is passed to the listener call.
      */
     public function setDispatcher(EventDispatcherInterface $dispatcher)
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
index fae922b739c43..cfa59769e7bd1 100644
--- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
+++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
@@ -29,7 +29,6 @@ class ExpressionLanguage
     protected $functions = array();
 
     /**
-     * @param ParserCacheInterface                  $cache
      * @param ExpressionFunctionProviderInterface[] $providers
      */
     public function __construct(ParserCacheInterface $cache = null, array $providers = array())
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index 575ebaac4adb1..814299dc43bbb 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -431,14 +431,13 @@ public function makePathRelative($endPath, $startPath)
     /**
      * Mirrors a directory to another.
      *
-     * @param string       $originDir The origin directory
-     * @param string       $targetDir The target directory
-     * @param \Traversable $iterator  A Traversable instance
-     * @param array        $options   An array of boolean options
-     *                                Valid options are:
-     *                                - $options['override'] Whether to override an existing file on copy or not (see copy())
-     *                                - $options['copy_on_windows'] Whether to copy files instead of links on Windows (see symlink())
-     *                                - $options['delete'] Whether to delete files that are not in the source directory (defaults to false)
+     * @param string $originDir The origin directory
+     * @param string $targetDir The target directory
+     * @param array  $options   An array of boolean options
+     *                          Valid options are:
+     *                          - $options['override'] Whether to override an existing file on copy or not (see copy())
+     *                          - $options['copy_on_windows'] Whether to copy files instead of links on Windows (see symlink())
+     *                          - $options['delete'] Whether to delete files that are not in the source directory (defaults to false)
      *
      * @throws IOException When file type is unknown
      */
diff --git a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
index c28f03ce5ff67..cbbd9fe753c0a 100644
--- a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
+++ b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
@@ -124,8 +124,7 @@ protected function canBeUsed()
     }
 
     /**
-     * @param Command $command
-     * @param string  $dir
+     * @param string $dir
      *
      * @return Command
      */
@@ -139,7 +138,6 @@ protected function buildFindCommand(Command $command, $dir)
     }
 
     /**
-     * @param Command  $command
      * @param string[] $names
      * @param bool     $not
      */
@@ -186,7 +184,6 @@ private function buildNamesFiltering(Command $command, array $names, $not = fals
     }
 
     /**
-     * @param Command  $command
      * @param string   $dir
      * @param string[] $paths
      * @param bool     $not
@@ -228,7 +225,6 @@ private function buildPathsFiltering(Command $command, $dir, array $paths, $not
     }
 
     /**
-     * @param Command            $command
      * @param NumberComparator[] $sizes
      */
     private function buildSizesFiltering(Command $command, array $sizes)
@@ -258,7 +254,6 @@ private function buildSizesFiltering(Command $command, array $sizes)
     }
 
     /**
-     * @param Command          $command
      * @param DateComparator[] $dates
      */
     private function buildDatesFiltering(Command $command, array $dates)
@@ -296,8 +291,7 @@ private function buildDatesFiltering(Command $command, array $dates)
     }
 
     /**
-     * @param Command $command
-     * @param string  $sort
+     * @param string $sort
      *
      * @throws \InvalidArgumentException
      */
@@ -307,15 +301,12 @@ private function buildSorting(Command $command, $sort)
     }
 
     /**
-     * @param Command $command
-     * @param string  $sort
+     * @param string $sort
      */
     abstract protected function buildFormatSorting(Command $command, $sort);
 
     /**
-     * @param Command $command
-     * @param array   $contains
-     * @param bool    $not
+     * @param bool $not
      */
     abstract protected function buildContentFiltering(Command $command, array $contains, $not = false);
 }
diff --git a/src/Symfony/Component/Finder/Exception/AdapterFailureException.php b/src/Symfony/Component/Finder/Exception/AdapterFailureException.php
index a560d19450157..6040b4eede78e 100644
--- a/src/Symfony/Component/Finder/Exception/AdapterFailureException.php
+++ b/src/Symfony/Component/Finder/Exception/AdapterFailureException.php
@@ -23,9 +23,8 @@ class AdapterFailureException extends \RuntimeException implements ExceptionInte
     private $adapter;
 
     /**
-     * @param AdapterInterface $adapter
-     * @param string|null      $message
-     * @param \Exception|null  $previous
+     * @param string|null     $message
+     * @param \Exception|null $previous
      */
     public function __construct(AdapterInterface $adapter, $message = null, \Exception $previous = null)
     {
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index 5784df439b0bf..3bcb50890179d 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -92,8 +92,7 @@ public static function create()
     /**
      * Registers a finder engine implementation.
      *
-     * @param AdapterInterface $adapter  An adapter instance
-     * @param int              $priority Highest is selected first
+     * @param int $priority Highest is selected first
      *
      * @return $this
      */
@@ -722,7 +721,6 @@ private function sortAdapters()
     }
 
     /**
-     * @param $dir
      *
      * @return \Iterator
      *
diff --git a/src/Symfony/Component/Finder/Iterator/FilePathsIterator.php b/src/Symfony/Component/Finder/Iterator/FilePathsIterator.php
index 4da2f5be012e6..cf079b4a8ff6c 100644
--- a/src/Symfony/Component/Finder/Iterator/FilePathsIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/FilePathsIterator.php
@@ -59,7 +59,6 @@ public function __construct(array $paths, $baseDir)
 
     /**
      * @param string $name
-     * @param array  $arguments
      *
      * @return mixed
      */
diff --git a/src/Symfony/Component/Finder/Tests/FakeAdapter/DummyAdapter.php b/src/Symfony/Component/Finder/Tests/FakeAdapter/DummyAdapter.php
index 0cbae14b88b78..700bf30127697 100644
--- a/src/Symfony/Component/Finder/Tests/FakeAdapter/DummyAdapter.php
+++ b/src/Symfony/Component/Finder/Tests/FakeAdapter/DummyAdapter.php
@@ -23,9 +23,6 @@ class DummyAdapter extends AbstractAdapter
      */
     private $iterator;
 
-    /**
-     * @param \Iterator $iterator
-     */
     public function __construct(\Iterator $iterator)
     {
         $this->iterator = $iterator;
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php b/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php
index c724a75c692d0..2b0f1e8fcff41 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php
@@ -37,14 +37,13 @@ protected function assertOrderedIterator($expected, \Traversable $iterator)
     }
 
     /**
-     *  Same as assertOrderedIterator, but checks the order of groups of
+     * Same as assertOrderedIterator, but checks the order of groups of
      *  array elements.
      *
      *  @param array $expected - an array of arrays. For any two subarrays
-     *      $a and $b such that $a goes before $b in $expected, the method
-     *      asserts that any element of $a goes before any element of $b
-     *      in the sequence generated by $iterator
-     *  @param \Traversable $iterator
+     * $a and $b such that $a goes before $b in $expected, the method
+     * asserts that any element of $a goes before any element of $b
+     * in the sequence generated by $iterator
      */
     protected function assertOrderedIteratorForGroups($expected, \Traversable $iterator)
     {
@@ -64,8 +63,7 @@ protected function assertOrderedIteratorForGroups($expected, \Traversable $itera
     /**
      * Same as IteratorTestCase::assertIterator with foreach usage.
      *
-     * @param array        $expected
-     * @param \Traversable $iterator
+     * @param array $expected
      */
     protected function assertIteratorInForeach($expected, \Traversable $iterator)
     {
@@ -84,8 +82,7 @@ protected function assertIteratorInForeach($expected, \Traversable $iterator)
     /**
      * Same as IteratorTestCase::assertOrderedIterator with foreach usage.
      *
-     * @param array        $expected
-     * @param \Traversable $iterator
+     * @param array $expected
      */
     protected function assertOrderedIteratorInForeach($expected, \Traversable $iterator)
     {
diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php
index 3dbe110fcb084..e894afc70798f 100644
--- a/src/Symfony/Component/Form/Button.php
+++ b/src/Symfony/Component/Form/Button.php
@@ -124,7 +124,6 @@ public function getParent()
      *
      * @param int|string|FormInterface $child
      * @param null                     $type
-     * @param array                    $options
      *
      * @throws BadMethodCallException
      */
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
index ebb84134803ad..51b22d4fd2839 100644
--- a/src/Symfony/Component/Form/ButtonBuilder.php
+++ b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -78,7 +78,6 @@ public function __construct($name, array $options = array())
      *
      * @param string|int|FormBuilderInterface $child
      * @param string|FormTypeInterface        $type
-     * @param array                           $options
      *
      * @throws BadMethodCallException
      */
@@ -94,7 +93,6 @@ public function add($child, $type = null, array $options = array())
      *
      * @param string                   $name
      * @param string|FormTypeInterface $type
-     * @param array                    $options
      *
      * @throws BadMethodCallException
      */
@@ -196,8 +194,7 @@ public function addEventSubscriber(EventSubscriberInterface $subscriber)
      *
      * This method should not be invoked.
      *
-     * @param DataTransformerInterface $viewTransformer
-     * @param bool                     $forcePrepend
+     * @param bool $forcePrepend
      *
      * @throws BadMethodCallException
      */
@@ -223,8 +220,7 @@ public function resetViewTransformers()
      *
      * This method should not be invoked.
      *
-     * @param DataTransformerInterface $modelTransformer
-     * @param bool                     $forceAppend
+     * @param bool $forceAppend
      *
      * @throws BadMethodCallException
      */
diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
index 418aa3200cc17..3fbb26f9dbcc6 100644
--- a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
+++ b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
@@ -219,8 +219,7 @@ protected function flatten(array $choices, $value, &$choicesByValues, &$keysByVa
      * Checks whether the given choices can be cast to strings without
      * generating duplicates.
      *
-     * @param array      $choices The choices
-     * @param array|null $cache   The cache for previously checked entries. Internal
+     * @param array|null $cache The cache for previously checked entries. Internal
      *
      * @return bool returns true if the choices can be cast to strings and
      *              false otherwise
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
index 42f7b916f6ed6..6ad1c46474c8b 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
@@ -113,9 +113,8 @@ public function createListFromFlippedChoices($choices, $value = null, $triggerDe
     /**
      * {@inheritdoc}
      *
-     * @param ChoiceLoaderInterface             $loader The choice loader
-     * @param null|callable|string|PropertyPath $value  The callable or path for
-     *                                                  generating the choice values
+     * @param null|callable|string|PropertyPath $value The callable or path for
+     *                                                 generating the choice values
      *
      * @return ChoiceListInterface The choice list
      */
@@ -144,7 +143,6 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
     /**
      * {@inheritdoc}
      *
-     * @param ChoiceListInterface                     $list             The choice list
      * @param null|array|callable|string|PropertyPath $preferredChoices The preferred choices
      * @param null|callable|string|PropertyPath       $label            The callable or path generating the choice labels
      * @param null|callable|string|PropertyPath       $index            The callable or path generating the view indices
diff --git a/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php b/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php
index ee00284bc4cf8..7c41ee5f0ac1b 100644
--- a/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php
+++ b/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php
@@ -50,8 +50,7 @@ class LazyChoiceList implements ChoiceListInterface
      * The callable receives the choice as first and the array key as the second
      * argument.
      *
-     * @param ChoiceLoaderInterface $loader The choice loader
-     * @param null|callable         $value  The callable generating the choice values
+     * @param null|callable $value The callable generating the choice values
      */
     public function __construct(ChoiceLoaderInterface $loader, $value = null)
     {
diff --git a/src/Symfony/Component/Form/ChoiceList/LegacyChoiceListAdapter.php b/src/Symfony/Component/Form/ChoiceList/LegacyChoiceListAdapter.php
index 929ef8c290ded..34464d5cef592 100644
--- a/src/Symfony/Component/Form/ChoiceList/LegacyChoiceListAdapter.php
+++ b/src/Symfony/Component/Form/ChoiceList/LegacyChoiceListAdapter.php
@@ -45,8 +45,6 @@ class LegacyChoiceListAdapter implements ChoiceListInterface
 
     /**
      * Adapts a legacy choice list to {@link ChoiceListInterface}.
-     *
-     * @param LegacyChoiceListInterface $adaptedList The adapted list
      */
     public function __construct(LegacyChoiceListInterface $adaptedList)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php
index 6fbacfde68f52..2dec270ab7323 100644
--- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php
+++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php
@@ -256,7 +256,6 @@ public function getIndicesForValues(array $values)
      * @param array              $bucketForRemaining The bucket where to store the non-preferred view objects
      * @param array|\Traversable $choices            The list of choices
      * @param array              $labels             The labels corresponding to the choices
-     * @param array              $preferredChoices   The preferred choices
      *
      * @throws InvalidArgumentException      if the structures of the choices and labels array do not match
      * @throws InvalidConfigurationException if no valid value or index could be created for a choice
@@ -301,7 +300,6 @@ protected function addChoices(array &$bucketForPreferred, array &$bucketForRemai
      * @param array  $bucketForRemaining The bucket where to store the non-preferred view objects
      * @param array  $choices            The list of choices in the group
      * @param array  $labels             The labels corresponding to the choices in the group
-     * @param array  $preferredChoices   The preferred choices
      *
      * @throws InvalidConfigurationException if no valid value or index could be created for a choice
      */
@@ -336,7 +334,6 @@ protected function addChoiceGroup($group, array &$bucketForPreferred, array &$bu
      * @param array  $bucketForRemaining The bucket where to store the non-preferred view objects
      * @param mixed  $choice             The choice to add
      * @param string $label              The label for the choice
-     * @param array  $preferredChoices   The preferred choices
      *
      * @throws InvalidConfigurationException if no valid value or index could be created
      */
@@ -496,8 +493,6 @@ protected function fixChoice($choice)
     /**
      * Fixes the data type of the given choices to avoid comparison problems.
      *
-     * @param array $choices The choices
-     *
      * @return array The fixed choices
      *
      * @see fixChoice()
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
index 72e659e61506e..7e85d74ed89d2 100644
--- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
+++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
@@ -87,7 +87,6 @@ public function getValuesForChoices(array $choices)
      * @param array              $bucketForRemaining The bucket where to store the non-preferred view objects
      * @param array|\Traversable $choices            The list of choices
      * @param array              $labels             Ignored
-     * @param array              $preferredChoices   The preferred choices
      */
     protected function addChoices(array &$bucketForPreferred, array &$bucketForRemaining, $choices, array $labels, array $preferredChoices)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
index 21a8711ca29b3..84df4145e7e1e 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
@@ -30,8 +30,7 @@ class ChoiceToBooleanArrayTransformer implements DataTransformerInterface
     private $placeholderPresent;
 
     /**
-     * @param ChoiceListInterface $choiceList
-     * @param bool                $placeholderPresent
+     * @param bool $placeholderPresent
      */
     public function __construct(ChoiceListInterface $choiceList, $placeholderPresent)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php
index 6576b95f796d8..ea26be10fc656 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php
@@ -32,9 +32,6 @@ class FixCheckboxInputListener implements EventSubscriberInterface
 {
     private $choiceList;
 
-    /**
-     * @param ChoiceListInterface $choiceList
-     */
     public function __construct(ChoiceListInterface $choiceList)
     {
         $this->choiceList = $choiceList;
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
index 98ac850c15726..d4d0517e2ae11 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
@@ -34,8 +34,7 @@ class FixRadioInputListener implements EventSubscriberInterface
     private $placeholderPresent;
 
     /**
-     * @param ChoiceListInterface $choiceList
-     * @param bool                $placeholderPresent
+     * @param bool $placeholderPresent
      */
     public function __construct(ChoiceListInterface $choiceList, $placeholderPresent)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index 6efcda8fd8f98..974eee166badb 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
@@ -33,7 +33,6 @@ class ResizeFormListener implements EventSubscriberInterface
 
     /**
      * @param string $type
-     * @param array  $options
      * @param bool   $allowAdd    Whether children could be added to the group
      * @param bool   $allowDelete Whether children could be removed from the group
      * @param bool   $deleteEmpty
diff --git a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
index b5073af7595a0..b7b20ec95c701 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
@@ -50,9 +50,7 @@ public static function getSubscribedEvents()
      *                                                     Validation of the token will only succeed if it was generated in the
      *                                                     same session and with the same tokenId
      * @param string                    $errorMessage      The message displayed in case of an error
-     * @param TranslatorInterface       $translator
      * @param null|string               $translationDomain
-     * @param ServerParams              $serverParams
      */
     public function __construct($fieldName, $tokenManager, $tokenId, $errorMessage, TranslatorInterface $translator = null, $translationDomain = null, ServerParams $serverParams = null)
     {
diff --git a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
index 646728bd1e1dd..ea73f5e480c20 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
@@ -46,9 +46,7 @@ class FormTypeCsrfExtension extends AbstractTypeExtension
      * @param CsrfTokenManagerInterface|CsrfProviderInterface $defaultTokenManager
      * @param bool                                            $defaultEnabled
      * @param string                                          $defaultFieldName
-     * @param TranslatorInterface                             $translator
      * @param null|string                                     $translationDomain
-     * @param ServerParams                                    $serverParams
      */
     public function __construct($defaultTokenManager, $defaultEnabled = true, $defaultFieldName = '_token', TranslatorInterface $translator = null, $translationDomain = null, ServerParams $serverParams = null)
     {
@@ -68,9 +66,6 @@ public function __construct($defaultTokenManager, $defaultEnabled = true, $defau
 
     /**
      * Adds a CSRF field to the form when the CSRF protection is enabled.
-     *
-     * @param FormBuilderInterface $builder The form builder
-     * @param array                $options The options
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -93,10 +88,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
     /**
      * Adds a CSRF field to the root form view.
-     *
-     * @param FormView      $view    The form view
-     * @param FormInterface $form    The form
-     * @param array         $options The options
      */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
diff --git a/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php b/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
index 4bebce09cd574..6503b1814b12c 100644
--- a/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
+++ b/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
@@ -38,7 +38,6 @@ public static function getSubscribedEvents()
 
     /**
      * @param ValidatorInterface|LegacyValidatorInterface $validator
-     * @param ViolationMapperInterface                    $violationMapper
      */
     public function __construct($validator, ViolationMapperInterface $violationMapper)
     {
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php
index 1fac736e8c9eb..7198c6a793daa 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php
@@ -24,9 +24,8 @@ class MappingRule
     private $targetPath;
 
     /**
-     * @param FormInterface $origin
-     * @param string        $propertyPath
-     * @param string        $targetPath
+     * @param string $propertyPath
+     * @param string $targetPath
      */
     public function __construct(FormInterface $origin, $propertyPath, $targetPath)
     {
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/RelativePath.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/RelativePath.php
index 658bad5a48f50..f07fc41271a85 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/RelativePath.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/RelativePath.php
@@ -22,8 +22,7 @@ class RelativePath extends PropertyPath
     private $root;
 
     /**
-     * @param FormInterface $root
-     * @param string        $propertyPath
+     * @param string $propertyPath
      */
     public function __construct(FormInterface $root, $propertyPath)
     {
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
index 8a3602e701c3a..3322abb382924 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
@@ -212,8 +212,7 @@ private function matchChild(FormInterface $form, PropertyPathIteratorInterface $
     /**
      * Reconstructs a property path from a violation path and a form tree.
      *
-     * @param ViolationPath $violationPath The violation path
-     * @param FormInterface $origin        The root form of the tree
+     * @param FormInterface $origin The root form of the tree
      *
      * @return RelativePath The reconstructed path
      */
diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php
index d64e2f26c6820..43be8bcd2068b 100644
--- a/src/Symfony/Component/Form/FormBuilder.php
+++ b/src/Symfony/Component/Form/FormBuilder.php
@@ -40,11 +40,8 @@ class FormBuilder extends FormConfigBuilder implements \IteratorAggregate, FormB
     /**
      * Creates a new form builder.
      *
-     * @param string                   $name
-     * @param string                   $dataClass
-     * @param EventDispatcherInterface $dispatcher
-     * @param FormFactoryInterface     $factory
-     * @param array                    $options
+     * @param string $name
+     * @param string $dataClass
      */
     public function __construct($name, $dataClass, EventDispatcherInterface $dispatcher, FormFactoryInterface $factory, array $options = array())
     {
diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
index 4ec16782c6074..a22cde5c014b5 100644
--- a/src/Symfony/Component/Form/FormConfigBuilder.php
+++ b/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -180,10 +180,9 @@ class FormConfigBuilder implements FormConfigBuilderInterface
     /**
      * Creates an empty form configuration.
      *
-     * @param string|int               $name       The form name
-     * @param string                   $dataClass  The class of the form's data
-     * @param EventDispatcherInterface $dispatcher The event dispatcher
-     * @param array                    $options    The form options
+     * @param string|int $name      The form name
+     * @param string     $dataClass The class of the form's data
+     * @param array      $options   The form options
      *
      * @throws InvalidArgumentException if the data class is not a valid class or if
      *                                  the name contains invalid characters
diff --git a/src/Symfony/Component/Form/Tests/AbstractFormTest.php b/src/Symfony/Component/Form/Tests/AbstractFormTest.php
index fb10318ebf572..c19dd08908441 100644
--- a/src/Symfony/Component/Form/Tests/AbstractFormTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractFormTest.php
@@ -55,10 +55,8 @@ protected function tearDown()
     abstract protected function createForm();
 
     /**
-     * @param string                   $name
-     * @param EventDispatcherInterface $dispatcher
-     * @param string                   $dataClass
-     * @param array                    $options
+     * @param string $name
+     * @param string $dataClass
      *
      * @return FormBuilder
      */
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
index 43112a4960eb0..bd1aab75713cb 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
@@ -52,9 +52,8 @@ private function getPropertyPath($path)
     }
 
     /**
-     * @param FormConfigInterface $config
-     * @param bool                $synchronized
-     * @param bool                $submitted
+     * @param bool $synchronized
+     * @param bool $submitted
      *
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
index 9e0b5f57e6473..340b5bb8714a1 100644
--- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
@@ -422,7 +422,6 @@ public function testExtractViewVariables()
 
     /**
      * @param string $name
-     * @param array  $options
      *
      * @return FormBuilder
      */
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
index 78015b504940b..27f7ec2e7310b 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -632,7 +632,6 @@ private function getMockExecutionContext()
     /**
      * @param string $name
      * @param string $dataClass
-     * @param array  $options
      *
      * @return FormBuilder
      */
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
index 53243c88f74d6..8e027f53b6c77 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
@@ -97,7 +97,6 @@ private function getDataMapper()
     }
 
     /**
-     * @param $propertyPath
      *
      * @return ConstraintViolation
      */
diff --git a/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php b/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
index 6ae8a85bcfc84..8b1fe8541f952 100644
--- a/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
@@ -332,7 +332,6 @@ private function getMockFormFactory()
 
     /**
      * @param string $name
-     * @param array  $options
      *
      * @return FormBuilder
      */
diff --git a/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php b/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php
index c69dbbba35663..82efc84609823 100644
--- a/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php
+++ b/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php
@@ -25,7 +25,6 @@ class AcceptHeaderItem
 
     /**
      * @param string $value
-     * @param array  $attributes
      */
     public function __construct($value, array $attributes = array())
     {
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index ce7258acd6931..8ace32e5da627 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -787,8 +787,6 @@ public function hasSession()
 
     /**
      * Sets the Session.
-     *
-     * @param SessionInterface $session The Session
      */
     public function setSession(SessionInterface $session)
     {
@@ -1479,8 +1477,6 @@ public function isMethod($method)
      *
      * @see https://tools.ietf.org/html/rfc7231#section-4.2.1
      *
-     * @param bool $andCacheable Adds the additional condition that the method should be cacheable. True by default.
-     *
      * @return bool
      */
     public function isMethodSafe(/* $andCacheable = true */)
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
index 076d077c7d072..03a3b36d22fed 100644
--- a/src/Symfony/Component/HttpFoundation/RequestMatcher.php
+++ b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
@@ -53,7 +53,6 @@ class RequestMatcher implements RequestMatcherInterface
      * @param string|null          $host
      * @param string|string[]|null $methods
      * @param string|string[]|null $ips
-     * @param array                $attributes
      * @param string|string[]|null $schemes
      */
     public function __construct($path = null, $host = null, $methods = null, $ips = null, array $attributes = array(), $schemes = null)
diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php
index d20a4daff90f3..b766f492b356b 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Session.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Session.php
@@ -30,9 +30,8 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable
     private $attributeName;
 
     /**
-     * @param SessionStorageInterface $storage    A SessionStorageInterface instance
-     * @param AttributeBagInterface   $attributes An AttributeBagInterface instance, (defaults null for default AttributeBag)
-     * @param FlashBagInterface       $flashes    A FlashBagInterface instance (defaults null for default FlashBag)
+     * @param AttributeBagInterface $attributes An AttributeBagInterface instance, (defaults null for default AttributeBag)
+     * @param FlashBagInterface     $flashes    A FlashBagInterface instance (defaults null for default FlashBag)
      */
     public function __construct(SessionStorageInterface $storage = null, AttributeBagInterface $attributes = null, FlashBagInterface $flashes = null)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
index ea11d604ac69b..ac4071408bfb6 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
@@ -57,12 +57,11 @@ class LegacyPdoSessionHandler implements \SessionHandlerInterface
      * Constructor.
      *
      * List of available options:
-     *  * db_table: The name of the table [required]
-     *  * db_id_col: The column where to store the session id [default: sess_id]
-     *  * db_data_col: The column where to store the session data [default: sess_data]
-     *  * db_time_col: The column where to store the timestamp [default: sess_time]
+     * * db_table: The name of the table [required]
+     * * db_id_col: The column where to store the session id [default: sess_id]
+     * * db_data_col: The column where to store the session data [default: sess_data]
+     * * db_time_col: The column where to store the timestamp [default: sess_time]
      *
-     * @param \PDO  $pdo       A \PDO instance
      * @param array $dbOptions An associative array of DB options
      *
      * @throws \InvalidArgumentException When "db_table" option is not provided
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
index 9575e4e9a7c76..0be4e540aaa68 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
@@ -32,11 +32,10 @@ class MemcacheSessionHandler implements \SessionHandlerInterface
      * Constructor.
      *
      * List of available options:
-     *  * prefix: The prefix to use for the memcache keys in order to avoid collision
-     *  * expiretime: The time to live in seconds
+     * * prefix: The prefix to use for the memcache keys in order to avoid collision
+     * * expiretime: The time to live in seconds
      *
-     * @param \Memcache $memcache A \Memcache instance
-     * @param array     $options  An associative array of Memcache options
+     * @param array $options An associative array of Memcache options
      *
      * @throws \InvalidArgumentException When unsupported options are passed
      */
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
index 2c45face4da09..bc1de620a9bc4 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -37,11 +37,10 @@ class MemcachedSessionHandler implements \SessionHandlerInterface
      * Constructor.
      *
      * List of available options:
-     *  * prefix: The prefix to use for the memcached keys in order to avoid collision
-     *  * expiretime: The time to live in seconds
+     * * prefix: The prefix to use for the memcached keys in order to avoid collision
+     * * expiretime: The time to live in seconds
      *
-     * @param \Memcached $memcached A \Memcached instance
-     * @param array      $options   An associative array of Memcached options
+     * @param array $options An associative array of Memcached options
      *
      * @throws \InvalidArgumentException When unsupported options are passed
      */
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
index 027f4efffce51..cb964f9e7c311 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
@@ -63,8 +63,7 @@ class MockArraySessionStorage implements SessionStorageInterface
     protected $bags = array();
 
     /**
-     * @param string      $name    Session name
-     * @param MetadataBag $metaBag MetadataBag instance
+     * @param string $name Session name
      */
     public function __construct($name = 'MOCKSESSID', MetadataBag $metaBag = null)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
index 0a580d6027c4f..06386e54866b6 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
@@ -27,9 +27,8 @@ class MockFileSessionStorage extends MockArraySessionStorage
     private $savePath;
 
     /**
-     * @param string      $savePath Path of directory to save session files
-     * @param string      $name     Session name
-     * @param MetadataBag $metaBag  MetadataBag instance
+     * @param string $savePath Path of directory to save session files
+     * @param string $name     Session name
      */
     public function __construct($savePath = null, $name = 'MOCKSESSID', MetadataBag $metaBag = null)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
index f03cdf343024d..0ab6b73736020 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -59,10 +59,10 @@ class NativeSessionStorage implements SessionStorageInterface
      *
      * @see http://php.net/session.configuration for options
      * but we omit 'session.' from the beginning of the keys for convenience.
-     *
+     * 
      * ("auto_start", is not supported as it tells PHP to start a session before
      * PHP starts to execute user-land code. Setting during runtime has no effect).
-     *
+     * 
      * cache_limiter, "" (use "0" to prevent headers from being sent entirely).
      * cookie_domain, ""
      * cookie_httponly, ""
@@ -98,7 +98,6 @@ class NativeSessionStorage implements SessionStorageInterface
      *
      * @param array                                                            $options Session configuration options
      * @param AbstractProxy|NativeSessionHandler|\SessionHandlerInterface|null $handler
-     * @param MetadataBag                                                      $metaBag MetadataBag
      */
     public function __construct(array $options = array(), $handler = null, MetadataBag $metaBag = null)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
index 3a2391e762e4e..b4e3b1dd15175 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php
@@ -23,7 +23,6 @@ class PhpBridgeSessionStorage extends NativeSessionStorage
 {
     /**
      * @param AbstractProxy|NativeSessionHandler|\SessionHandlerInterface|null $handler
-     * @param MetadataBag                                                      $metaBag MetadataBag
      */
     public function __construct($handler = null, MetadataBag $metaBag = null)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
index 6190d3ed1fd94..730eb8b0623ae 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
@@ -18,9 +18,6 @@ class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterf
 {
     protected $handler;
 
-    /**
-     * @param \SessionHandlerInterface $handler
-     */
     public function __construct(\SessionHandlerInterface $handler)
     {
         $this->handler = $handler;
diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php
index c19b6ade76cc5..72b309acb264a 100644
--- a/src/Symfony/Component/HttpKernel/Client.php
+++ b/src/Symfony/Component/HttpKernel/Client.php
@@ -34,10 +34,9 @@ class Client extends BaseClient
     protected $kernel;
 
     /**
-     * @param HttpKernelInterface $kernel    An HttpKernel instance
-     * @param array               $server    The server parameters (equivalent of $_SERVER)
-     * @param History             $history   A History instance to store the browser history
-     * @param CookieJar           $cookieJar A CookieJar instance to store the cookies
+     * @param array     $server    The server parameters (equivalent of $_SERVER)
+     * @param History   $history   A History instance to store the browser history
+     * @param CookieJar $cookieJar A CookieJar instance to store the cookies
      */
     public function __construct(HttpKernelInterface $kernel, array $server = array(), History $history = null, CookieJar $cookieJar = null)
     {
diff --git a/src/Symfony/Component/HttpKernel/Config/FileLocator.php b/src/Symfony/Component/HttpKernel/Config/FileLocator.php
index fb1f913bdff5d..1221242edf289 100644
--- a/src/Symfony/Component/HttpKernel/Config/FileLocator.php
+++ b/src/Symfony/Component/HttpKernel/Config/FileLocator.php
@@ -25,9 +25,8 @@ class FileLocator extends BaseFileLocator
     private $path;
 
     /**
-     * @param KernelInterface $kernel A KernelInterface instance
-     * @param null|string     $path   The path the global resource directory
-     * @param array           $paths  An array of paths where to look for resources
+     * @param null|string $path  The path the global resource directory
+     * @param array       $paths An array of paths where to look for resources
      */
     public function __construct(KernelInterface $kernel, $path = null, array $paths = array())
     {
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
index 8a3ea1b840681..4494c594682b8 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -112,9 +112,8 @@ public function getArguments(Request $request, $controller)
     }
 
     /**
-     * @param Request                $request
-     * @param callable               $controller
-     * @param \ReflectionParameter[] $parameters
+     * @param callable              $controller
+     * @param ReflectionParameter[] $parameters
      *
      * @return array The arguments to use when calling the action
      */
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
index a473838bf89c3..d2c6063057802 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
@@ -33,11 +33,8 @@ class ContainerAwareHttpKernel extends HttpKernel
     protected $container;
 
     /**
-     * @param EventDispatcherInterface    $dispatcher         An EventDispatcherInterface instance
-     * @param ContainerInterface          $container          A ContainerInterface instance
-     * @param ControllerResolverInterface $controllerResolver A ControllerResolverInterface instance
-     * @param RequestStack                $requestStack       A stack for master/sub requests
-     * @param bool                        $triggerDeprecation Whether or not to trigger the deprecation warning for the ContainerAwareHttpKernel
+     * @param RequestStack $requestStack       A stack for master/sub requests
+     * @param bool         $triggerDeprecation Whether or not to trigger the deprecation warning for the ContainerAwareHttpKernel
      */
     public function __construct(EventDispatcherInterface $dispatcher, ContainerInterface $container, ControllerResolverInterface $controllerResolver, RequestStack $requestStack = null, $triggerDeprecation = true)
     {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
index b42418e7a2940..dba85d4fe27d2 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
@@ -90,8 +90,7 @@ public static function getSubscribedEvents()
     /**
      * Logs an exception.
      *
-     * @param \Exception $exception The \Exception instance
-     * @param string     $message   The error message to log
+     * @param string $message The error message to log
      */
     protected function logException(\Exception $exception, $message)
     {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
index 0420ecd1afbe4..e47f0d67479c0 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
@@ -35,8 +35,7 @@ class FragmentListener implements EventSubscriberInterface
     private $fragmentPath;
 
     /**
-     * @param UriSigner $signer       A UriSigner instance
-     * @param string    $fragmentPath The path that triggers this listener
+     * @param string $fragmentPath The path that triggers this listener
      */
     public function __construct(UriSigner $signer, $fragmentPath = '/_fragment')
     {
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
index 16622091aafb8..00b82ca2f8d9b 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
@@ -39,7 +39,6 @@ class ProfilerListener implements EventSubscriberInterface
     protected $parents;
 
     /**
-     * @param Profiler                     $profiler           A Profiler instance
      * @param RequestMatcherInterface|null $matcher            A RequestMatcher instance
      * @param bool                         $onlyException      True if the profiler only collects data when an exception occurs, false otherwise
      * @param bool                         $onlyMasterRequests True if the profiler only collects data when the request is a master request, false otherwise
diff --git a/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php
index 39418842666b2..5a7ee7d1062bd 100644
--- a/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php
@@ -18,9 +18,8 @@
 class AccessDeniedHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string $message The internal exception message
+     * @param int    $code    The internal exception code
      */
     public function __construct($message = null, \Exception $previous = null, $code = 0)
     {
diff --git a/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php b/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php
index c28d83739c7a5..377951fb81ff0 100644
--- a/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php
@@ -17,9 +17,8 @@
 class BadRequestHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string $message The internal exception message
+     * @param int    $code    The internal exception code
      */
     public function __construct($message = null, \Exception $previous = null, $code = 0)
     {
diff --git a/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php b/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php
index 79f24f2e56dc0..d40e5b8b3cf13 100644
--- a/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php
@@ -17,9 +17,8 @@
 class ConflictHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string $message The internal exception message
+     * @param int    $code    The internal exception code
      */
     public function __construct($message = null, \Exception $previous = null, $code = 0)
     {
diff --git a/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php b/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php
index 84e6915df70f7..26977f2da2dad 100644
--- a/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/GoneHttpException.php
@@ -17,9 +17,8 @@
 class GoneHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string $message The internal exception message
+     * @param int    $code    The internal exception code
      */
     public function __construct($message = null, \Exception $previous = null, $code = 0)
     {
diff --git a/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php b/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php
index 645efe87d7c23..5d6c501c127c1 100644
--- a/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/LengthRequiredHttpException.php
@@ -17,9 +17,8 @@
 class LengthRequiredHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string $message The internal exception message
+     * @param int    $code    The internal exception code
      */
     public function __construct($message = null, \Exception $previous = null, $code = 0)
     {
diff --git a/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php
index e308a5fee2767..3b793398fb015 100644
--- a/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/MethodNotAllowedHttpException.php
@@ -17,10 +17,9 @@
 class MethodNotAllowedHttpException extends HttpException
 {
     /**
-     * @param array      $allow    An array of allowed methods
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param array  $allow   An array of allowed methods
+     * @param string $message The internal exception message
+     * @param int    $code    The internal exception code
      */
     public function __construct(array $allow, $message = null, \Exception $previous = null, $code = 0)
     {
diff --git a/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php b/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php
index 097a13fd9bc05..5fad17ce66e53 100644
--- a/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/NotAcceptableHttpException.php
@@ -17,9 +17,8 @@
 class NotAcceptableHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string $message The internal exception message
+     * @param int    $code    The internal exception code
      */
     public function __construct($message = null, \Exception $previous = null, $code = 0)
     {
diff --git a/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php b/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php
index 878173cc7b9ac..ddc9b2ce8677c 100644
--- a/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/NotFoundHttpException.php
@@ -17,9 +17,8 @@
 class NotFoundHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string $message The internal exception message
+     * @param int    $code    The internal exception code
      */
     public function __construct($message = null, \Exception $previous = null, $code = 0)
     {
diff --git a/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php
index 9f13a624cc0fb..e75a522ecb6df 100644
--- a/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/PreconditionFailedHttpException.php
@@ -17,9 +17,8 @@
 class PreconditionFailedHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string $message The internal exception message
+     * @param int    $code    The internal exception code
      */
     public function __construct($message = null, \Exception $previous = null, $code = 0)
     {
diff --git a/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php b/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php
index 9d0a36d7d34d6..ac45e3cd0cf29 100644
--- a/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/PreconditionRequiredHttpException.php
@@ -19,9 +19,8 @@
 class PreconditionRequiredHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string $message The internal exception message
+     * @param int    $code    The internal exception code
      */
     public function __construct($message = null, \Exception $previous = null, $code = 0)
     {
diff --git a/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php b/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php
index b2767c3fd5bcc..5034b0627e759 100644
--- a/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/ServiceUnavailableHttpException.php
@@ -19,7 +19,6 @@ class ServiceUnavailableHttpException extends HttpException
     /**
      * @param int|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
      * @param string     $message    The internal exception message
-     * @param \Exception $previous   The previous exception
      * @param int        $code       The internal exception code
      */
     public function __construct($retryAfter = null, $message = null, \Exception $previous = null, $code = 0)
diff --git a/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php b/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php
index 7d8a803323b7c..d503f38f61d29 100644
--- a/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/TooManyRequestsHttpException.php
@@ -21,7 +21,6 @@ class TooManyRequestsHttpException extends HttpException
     /**
      * @param int|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
      * @param string     $message    The internal exception message
-     * @param \Exception $previous   The previous exception
      * @param int        $code       The internal exception code
      */
     public function __construct($retryAfter = null, $message = null, \Exception $previous = null, $code = 0)
diff --git a/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php
index 05ac875c552e2..802363bfc52a0 100644
--- a/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/UnauthorizedHttpException.php
@@ -17,10 +17,9 @@
 class UnauthorizedHttpException extends HttpException
 {
     /**
-     * @param string     $challenge WWW-Authenticate challenge string
-     * @param string     $message   The internal exception message
-     * @param \Exception $previous  The previous exception
-     * @param int        $code      The internal exception code
+     * @param string $challenge WWW-Authenticate challenge string
+     * @param string $message   The internal exception message
+     * @param int    $code      The internal exception code
      */
     public function __construct($challenge, $message = null, \Exception $previous = null, $code = 0)
     {
diff --git a/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php
index 01b8b8465a1a3..f84e78aa47e34 100644
--- a/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/UnprocessableEntityHttpException.php
@@ -17,9 +17,8 @@
 class UnprocessableEntityHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string $message The internal exception message
+     * @param int    $code    The internal exception code
      */
     public function __construct($message = null, \Exception $previous = null, $code = 0)
     {
diff --git a/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php b/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php
index 6913504e832dc..83991b0a2b5a4 100644
--- a/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php
+++ b/src/Symfony/Component/HttpKernel/Exception/UnsupportedMediaTypeHttpException.php
@@ -17,9 +17,8 @@
 class UnsupportedMediaTypeHttpException extends HttpException
 {
     /**
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
+     * @param string $message The internal exception message
+     * @param int    $code    The internal exception code
      */
     public function __construct($message = null, \Exception $previous = null, $code = 0)
     {
diff --git a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
index 07eda6f1c1c06..ea02136dafca2 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
@@ -32,9 +32,7 @@ abstract class AbstractSurrogateFragmentRenderer extends RoutableFragmentRendere
      * The "fallback" strategy when surrogate is not available should always be an
      * instance of InlineFragmentRenderer.
      *
-     * @param SurrogateInterface        $surrogate      An Surrogate instance
      * @param FragmentRendererInterface $inlineStrategy The inline strategy to use when the surrogate is not supported
-     * @param UriSigner                 $signer
      */
     public function __construct(SurrogateInterface $surrogate = null, FragmentRendererInterface $inlineStrategy, UriSigner $signer = null)
     {
diff --git a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
index 3252f061e5fc7..b05b7844d3317 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
@@ -34,7 +34,6 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
 
     /**
      * @param EngineInterface|Environment $templating            An EngineInterface or a Twig instance
-     * @param UriSigner                   $signer                A UriSigner instance
      * @param string                      $globalDefaultTemplate The global default content (it can be a template name or the content)
      * @param string                      $charset
      */
diff --git a/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
index d7eeb89a6befc..ec91d7aa2f995 100644
--- a/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
+++ b/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
@@ -39,10 +39,8 @@ public function setFragmentPath($path)
     /**
      * Generates a fragment URI for a given controller.
      *
-     * @param ControllerReference $reference A ControllerReference instance
-     * @param Request             $request   A Request instance
-     * @param bool                $absolute  Whether to generate an absolute URL or not
-     * @param bool                $strict    Whether to allow non-scalar attributes or not
+     * @param bool $absolute Whether to generate an absolute URL or not
+     * @param bool $strict   Whether to allow non-scalar attributes or not
      *
      * @return string A fragment URI
      */
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
index 02db7ce672369..8d9ca9abfd641 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/Esi.php
@@ -75,8 +75,6 @@ public function hasSurrogateCapability(Request $request)
     /**
      * Checks that at least one surrogate has ESI/1.0 capability.
      *
-     * @param Request $request A Request instance
-     *
      * @return bool true if one surrogate has ESI/1.0 capability, false otherwise
      *
      * @deprecated since version 2.6, to be removed in 3.0. Use hasSurrogateCapability() instead
@@ -102,8 +100,6 @@ public function addSurrogateCapability(Request $request)
     /**
      * Adds ESI/1.0 capability to the given Request.
      *
-     * @param Request $request A Request instance
-     *
      * @deprecated since version 2.6, to be removed in 3.0. Use addSurrogateCapability() instead
      */
     public function addSurrogateEsiCapability(Request $request)
@@ -142,8 +138,6 @@ public function needsParsing(Response $response)
     /**
      * Checks that the Response needs to be parsed for ESI tags.
      *
-     * @param Response $response A Response instance
-     *
      * @return bool true if the Response needs to be parsed, false otherwise
      *
      * @deprecated since version 2.6, to be removed in 3.0. Use needsParsing() instead
@@ -247,10 +241,9 @@ public function process(Request $request, Response $response)
     /**
      * Handles an ESI from the cache.
      *
-     * @param HttpCache $cache        An HttpCache instance
-     * @param string    $uri          The main URI
-     * @param string    $alt          An alternative URI
-     * @param bool      $ignoreErrors Whether to ignore errors or not
+     * @param string $uri          The main URI
+     * @param string $alt          An alternative URI
+     * @param bool   $ignoreErrors Whether to ignore errors or not
      *
      * @return string
      *
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
index 81c75ff7403a4..dc1f0024b10fc 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -241,8 +241,7 @@ public function terminate(Request $request, Response $response)
     /**
      * Forwards the Request to the backend without storing the Response in the cache.
      *
-     * @param Request $request A Request instance
-     * @param bool    $catch   Whether to process exceptions
+     * @param bool $catch Whether to process exceptions
      *
      * @return Response A Response instance
      */
@@ -256,8 +255,7 @@ protected function pass(Request $request, $catch = false)
     /**
      * Invalidates non-safe methods (like POST, PUT, and DELETE).
      *
-     * @param Request $request A Request instance
-     * @param bool    $catch   Whether to process exceptions
+     * @param bool $catch Whether to process exceptions
      *
      * @return Response A Response instance
      *
@@ -305,8 +303,7 @@ protected function invalidate(Request $request, $catch = false)
      * the backend using conditional GET. When no matching cache entry is found,
      * it triggers "miss" processing.
      *
-     * @param Request $request A Request instance
-     * @param bool    $catch   Whether to process exceptions
+     * @param bool $catch Whether to process exceptions
      *
      * @return Response A Response instance
      *
@@ -358,9 +355,8 @@ protected function lookup(Request $request, $catch = false)
      * The original request is used as a template for a conditional
      * GET request with the backend.
      *
-     * @param Request  $request A Request instance
-     * @param Response $entry   A Response instance to validate
-     * @param bool     $catch   Whether to process exceptions
+     * @param Response $entry A Response instance to validate
+     * @param bool     $catch Whether to process exceptions
      *
      * @return Response A Response instance
      */
@@ -422,8 +418,7 @@ protected function validate(Request $request, Response $entry, $catch = false)
      *
      * This methods is triggered when the cache missed or a reload is required.
      *
-     * @param Request $request A Request instance
-     * @param bool    $catch   Whether to process exceptions
+     * @param bool $catch Whether to process exceptions
      *
      * @return Response A Response instance
      */
@@ -452,9 +447,8 @@ protected function fetch(Request $request, $catch = false)
     /**
      * Forwards the Request to the backend and returns the Response.
      *
-     * @param Request  $request A Request instance
-     * @param bool     $catch   Whether to catch exceptions or not
-     * @param Response $entry   A Response instance (the stale entry if present, null otherwise)
+     * @param bool     $catch Whether to catch exceptions or not
+     * @param Response $entry A Response instance (the stale entry if present, null otherwise)
      *
      * @return Response A Response instance
      */
@@ -676,8 +670,7 @@ private function isPrivateRequest(Request $request)
     /**
      * Records that an event took place.
      *
-     * @param Request $request A Request instance
-     * @param string  $event   The event name
+     * @param string $event The event name
      */
     private function record(Request $request, $event)
     {
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
index 60c000f030638..aa5318a058452 100644
--- a/src/Symfony/Component/HttpKernel/HttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -99,8 +99,7 @@ public function terminateWithException(\Exception $exception, Request $request =
      *
      * Exceptions are not caught.
      *
-     * @param Request $request A Request instance
-     * @param int     $type    The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
+     * @param int $type The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
      *
      * @return Response A Response instance
      *
@@ -160,9 +159,8 @@ private function handleRaw(Request $request, $type = self::MASTER_REQUEST)
     /**
      * Filters a response object.
      *
-     * @param Response $response A Response instance
-     * @param Request  $request  An error message in case the response is not a Response object
-     * @param int      $type     The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
+     * @param Request $request An error message in case the response is not a Response object
+     * @param int     $type    The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
      *
      * @return Response The filtered Response instance
      *
@@ -186,8 +184,7 @@ private function filterResponse(Response $response, Request $request, $type)
      * operations such as {@link RequestStack::getParentRequest()} can lead to
      * weird results.
      *
-     * @param Request $request
-     * @param int     $type
+     * @param int $type
      */
     private function finishRequest(Request $request, $type)
     {
@@ -198,9 +195,8 @@ private function finishRequest(Request $request, $type)
     /**
      * Handles an exception by trying to convert it to a Response.
      *
-     * @param \Exception $e       An \Exception instance
-     * @param Request    $request A Request instance
-     * @param int        $type    The type of the request
+     * @param Request $request A Request instance
+     * @param int     $type    The type of the request
      *
      * @return Response A Response instance
      *
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index afbd8159996f3..00fbc214de062 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -655,7 +655,6 @@ protected function getContainerBuilder()
     /**
      * Dumps the service container to PHP code in the cache.
      *
-     * @param ConfigCache      $cache     The config cache
      * @param ContainerBuilder $container The service container
      * @param string           $class     The name of the class to generate
      * @param string           $baseClass The name of the container's base class
diff --git a/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
index 68a27c432389e..be2a244ebfc1f 100644
--- a/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
@@ -90,42 +90,37 @@ public function generateData(GeneratorConfig $config)
     }
 
     /**
-     * @param LocaleScanner $scanner
-     * @param string        $sourceDir
+     * @param string $sourceDir
      *
      * @return string[]
      */
     abstract protected function scanLocales(LocaleScanner $scanner, $sourceDir);
 
     /**
-     * @param GenrbCompiler $compiler
-     * @param string        $sourceDir
-     * @param string        $tempDir
+     * @param string $sourceDir
+     * @param string $tempDir
      */
     abstract protected function compileTemporaryBundles(GenrbCompiler $compiler, $sourceDir, $tempDir);
 
     abstract protected function preGenerate();
 
     /**
-     * @param BundleReaderInterface $reader
-     * @param string                $tempDir
-     * @param string                $displayLocale
+     * @param string $tempDir
+     * @param string $displayLocale
      *
      * @return array|null
      */
     abstract protected function generateDataForLocale(BundleReaderInterface $reader, $tempDir, $displayLocale);
 
     /**
-     * @param BundleReaderInterface $reader
-     * @param string                $tempDir
+     * @param string $tempDir
      *
      * @return array|null
      */
     abstract protected function generateDataForRoot(BundleReaderInterface $reader, $tempDir);
 
     /**
-     * @param BundleReaderInterface $reader
-     * @param string                $tempDir
+     * @param string $tempDir
      *
      * @return array|null
      */
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Transformer.php
index 25ecab572a515..0bfe09fd89fed 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Transformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Transformer.php
@@ -21,7 +21,6 @@ abstract class Transformer
     /**
      * Format a value using a configured DateTime as date/time source.
      *
-     *
      * @param \DateTime $dateTime A DateTime object to be used to generate the formatted value
      * @param int       $length   The formatted value string length
      *
diff --git a/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php b/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php
index b528b3b0a7fe3..90bd948940f7c 100644
--- a/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php
+++ b/src/Symfony/Component/Intl/ResourceBundle/CurrencyBundle.php
@@ -30,9 +30,7 @@ class CurrencyBundle extends CurrencyDataProvider implements CurrencyBundleInter
     /**
      * Creates a new currency bundle.
      *
-     * @param string                     $path
-     * @param BundleEntryReaderInterface $reader
-     * @param LocaleDataProvider         $localeProvider
+     * @param string $path
      */
     public function __construct($path, BundleEntryReaderInterface $reader, LocaleDataProvider $localeProvider)
     {
diff --git a/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php b/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php
index ee319544e5414..51e07bffd860a 100644
--- a/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php
+++ b/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php
@@ -32,10 +32,7 @@ class LanguageBundle extends LanguageDataProvider implements LanguageBundleInter
     /**
      * Creates a new language bundle.
      *
-     * @param string                     $path
-     * @param BundleEntryReaderInterface $reader
-     * @param LocaleDataProvider         $localeProvider
-     * @param ScriptDataProvider         $scriptProvider
+     * @param string $path
      */
     public function __construct($path, BundleEntryReaderInterface $reader, LocaleDataProvider $localeProvider, ScriptDataProvider $scriptProvider)
     {
diff --git a/src/Symfony/Component/Intl/ResourceBundle/RegionBundle.php b/src/Symfony/Component/Intl/ResourceBundle/RegionBundle.php
index d709ba55626f6..4019ec2b398fc 100644
--- a/src/Symfony/Component/Intl/ResourceBundle/RegionBundle.php
+++ b/src/Symfony/Component/Intl/ResourceBundle/RegionBundle.php
@@ -30,9 +30,7 @@ class RegionBundle extends RegionDataProvider implements RegionBundleInterface
     /**
      * Creates a new region bundle.
      *
-     * @param string                     $path
-     * @param BundleEntryReaderInterface $reader
-     * @param LocaleDataProvider         $localeProvider
+     * @param string $path
      */
     public function __construct($path, BundleEntryReaderInterface $reader, LocaleDataProvider $localeProvider)
     {
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
index e47b5f6d48b1c..1530f4a368729 100644
--- a/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
+++ b/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
@@ -1015,9 +1015,6 @@ protected function assertIsIntlSuccess($formatter, $errorMessage, $errorCode)
     }
 
     /**
-     * @param $locale
-     * @param $datetype
-     * @param $timetype
      * @param null $timezone
      * @param int  $calendar
      * @param null $pattern
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
index 316bbfda811c5..fe0f2fdf71f88 100644
--- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -375,8 +375,7 @@ public function getDefinedOptions()
      *
      * The resolved option value is set to the return value of the closure.
      *
-     * @param string   $option     The option name
-     * @param \Closure $normalizer The normalizer
+     * @param string $option The option name
      *
      * @return $this
      *
diff --git a/src/Symfony/Component/Process/Pipes/UnixPipes.php b/src/Symfony/Component/Process/Pipes/UnixPipes.php
index 65f32ecf2735a..17174a7a8726f 100644
--- a/src/Symfony/Component/Process/Pipes/UnixPipes.php
+++ b/src/Symfony/Component/Process/Pipes/UnixPipes.php
@@ -143,7 +143,6 @@ public function areOpen()
     /**
      * Creates a new UnixPipes instance.
      *
-     * @param Process         $process
      * @param string|resource $input
      *
      * @return static
diff --git a/src/Symfony/Component/Process/Pipes/WindowsPipes.php b/src/Symfony/Component/Process/Pipes/WindowsPipes.php
index bcf1329f434ec..e02056ce7bb81 100644
--- a/src/Symfony/Component/Process/Pipes/WindowsPipes.php
+++ b/src/Symfony/Component/Process/Pipes/WindowsPipes.php
@@ -176,9 +176,6 @@ public function close()
     /**
      * Creates a new WindowsPipes instance.
      *
-     * @param Process $process The process
-     * @param $input
-     *
      * @return static
      */
     public static function create(Process $process, $input)
diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/ProcessBuilder.php
index 3d90f1a5d6d71..918bbec66bd70 100644
--- a/src/Symfony/Component/Process/ProcessBuilder.php
+++ b/src/Symfony/Component/Process/ProcessBuilder.php
@@ -149,8 +149,6 @@ public function setEnv($name, $value)
      * overridden by the new values passed to this method. Pass `null` to unset
      * a variable.
      *
-     * @param array $variables The variables
-     *
      * @return $this
      */
     public function addEnvironmentVariables(array $variables)
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
index c614b3aa40089..dd7432740fa5b 100644
--- a/src/Symfony/Component/Process/Tests/ProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1234,7 +1234,6 @@ public function provideVariousIncrementals()
      * @param null|array  $env
      * @param null|string $input
      * @param int         $timeout
-     * @param array       $options
      *
      * @return Process
      */
diff --git a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TypeHinted.php b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TypeHinted.php
index ce0f3d89aaa30..25b8604cd9bee 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TypeHinted.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TypeHinted.php
@@ -41,9 +41,6 @@ public function getCountable()
         return $this->countable;
     }
 
-    /**
-     * @param \Countable $countable
-     */
     public function setCountable(\Countable $countable)
     {
         $this->countable = $countable;
diff --git a/src/Symfony/Component/Routing/CompiledRoute.php b/src/Symfony/Component/Routing/CompiledRoute.php
index c95477ae631c1..9cc662d8c8bbe 100644
--- a/src/Symfony/Component/Routing/CompiledRoute.php
+++ b/src/Symfony/Component/Routing/CompiledRoute.php
@@ -33,7 +33,6 @@ class CompiledRoute implements \Serializable
      * @param array       $tokens        An array of tokens to use to generate URL for this route
      * @param array       $pathVariables An array of path variables
      * @param string|null $hostRegex     Host regex
-     * @param array       $hostTokens    Host tokens
      * @param array       $hostVariables An array of host variables
      * @param array       $variables     An array of variables (variables defined in the path and in the host patterns)
      */
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
index d84b1405e41d3..25f3da38392de 100644
--- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -182,9 +182,6 @@ public function getResolver()
     /**
      * Gets the default route name for a class method.
      *
-     * @param \ReflectionClass  $class
-     * @param \ReflectionMethod $method
-     *
      * @return string
      */
     protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method)
diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
index 7dfd707ebcd5e..7a9204e97287e 100644
--- a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
@@ -99,9 +99,8 @@ public function supports($resource, $type = null)
     /**
      * Parses a route and adds it to the RouteCollection.
      *
-     * @param RouteCollection $collection RouteCollection instance
-     * @param \DOMElement     $node       Element to parse that represents a Route
-     * @param string          $path       Full path of the XML file being processed
+     * @param \DOMElement $node Element to parse that represents a Route
+     * @param string      $path Full path of the XML file being processed
      *
      * @throws \InvalidArgumentException When the XML is invalid
      */
@@ -152,10 +151,9 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $node, $p
     /**
      * Parses an import and adds the routes in the resource to the RouteCollection.
      *
-     * @param RouteCollection $collection RouteCollection instance
-     * @param \DOMElement     $node       Element to parse that represents a Route
-     * @param string          $path       Full path of the XML file being processed
-     * @param string          $file       Loaded file name
+     * @param \DOMElement $node Element to parse that represents a Route
+     * @param string      $path Full path of the XML file being processed
+     * @param string      $file Loaded file name
      *
      * @throws \InvalidArgumentException When the XML is invalid
      */
diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
index 4810ce409e80c..9682f29f85ec2 100644
--- a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
@@ -111,10 +111,9 @@ public function supports($resource, $type = null)
     /**
      * Parses a route and adds it to the RouteCollection.
      *
-     * @param RouteCollection $collection A RouteCollection instance
-     * @param string          $name       Route name
-     * @param array           $config     Route definition
-     * @param string          $path       Full path of the YAML file being processed
+     * @param string $name   Route name
+     * @param array  $config Route definition
+     * @param string $path   Full path of the YAML file being processed
      */
     protected function parseRoute(RouteCollection $collection, $name, array $config, $path)
     {
@@ -152,10 +151,9 @@ protected function parseRoute(RouteCollection $collection, $name, array $config,
     /**
      * Parses an import and adds the routes in the resource to the RouteCollection.
      *
-     * @param RouteCollection $collection A RouteCollection instance
-     * @param array           $config     Route definition
-     * @param string          $path       Full path of the YAML file being processed
-     * @param string          $file       Loaded file name
+     * @param array  $config Route definition
+     * @param string $path   Full path of the YAML file being processed
+     * @param string $file   Loaded file name
      */
     protected function parseImport(RouteCollection $collection, array $config, $path, $file)
     {
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
index 22e2206c464a5..376b2f3a2a8a9 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
@@ -112,7 +112,6 @@ public function dump(array $options = array())
      *
      * @param string $name            Route name
      * @param Route  $route           The route
-     * @param array  $options         Options
      * @param bool   $hostRegexUnique Unique identifier for the host regex
      *
      * @return string The compiled route
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php b/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php
index aa256fc9a98ec..7d6ac58771cd5 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php
@@ -47,8 +47,6 @@ public function all()
 
     /**
      * Adds a route or collection.
-     *
-     * @param DumperRoute|DumperCollection The route or collection
      */
     public function add($child)
     {
@@ -60,8 +58,6 @@ public function add($child)
 
     /**
      * Sets children.
-     *
-     * @param array $children The children
      */
     public function setAll(array $children)
     {
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php b/src/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php
index c71989a3a1532..cae7d3d8586d8 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php
@@ -26,8 +26,7 @@ class DumperRoute
     private $route;
 
     /**
-     * @param string $name  The route name
-     * @param Route  $route The route
+     * @param string $name The route name
      */
     public function __construct($name, Route $route)
     {
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
index 016021e259c5f..6a1f438aa145f 100644
--- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -113,8 +113,7 @@ public function match(\$rawPathinfo)
     /**
      * Generates PHP code to match a RouteCollection with all its routes.
      *
-     * @param RouteCollection $routes               A RouteCollection instance
-     * @param bool            $supportsRedirections Whether redirections are supported by the base class
+     * @param bool $supportsRedirections Whether redirections are supported by the base class
      *
      * @return string PHP code
      */
@@ -154,9 +153,8 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections)
     /**
      * Generates PHP code recursively to match a tree of routes.
      *
-     * @param DumperPrefixCollection $collection           A DumperPrefixCollection instance
-     * @param bool                   $supportsRedirections Whether redirections are supported by the base class
-     * @param string                 $parentPrefix         Prefix of the parent collection
+     * @param bool   $supportsRedirections Whether redirections are supported by the base class
+     * @param string $parentPrefix         Prefix of the parent collection
      *
      * @return string PHP code
      */
@@ -193,7 +191,6 @@ private function compilePrefixRoutes(DumperPrefixCollection $collection, $suppor
     /**
      * Compiles a single Route to PHP code used to match it against the path info.
      *
-     * @param Route       $route                A Route instance
      * @param string      $name                 The name of the Route
      * @param bool        $supportsRedirections Whether redirections are supported by the base class
      * @param string|null $parentPrefix         The prefix of the parent collection used to optimize the code
diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
index 1ef92827dccb9..db1707f809d4f 100644
--- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
+++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -182,7 +182,6 @@ protected function getAttributes(Route $route, $name, array $attributes)
      *
      * @param string $pathinfo The path
      * @param string $name     The route name
-     * @param Route  $route    The route
      *
      * @return array The first element represents the status, the second contains additional information
      */
diff --git a/src/Symfony/Component/Routing/RequestContext.php b/src/Symfony/Component/Routing/RequestContext.php
index d62a7766ef859..7b591a4f08bcb 100644
--- a/src/Symfony/Component/Routing/RequestContext.php
+++ b/src/Symfony/Component/Routing/RequestContext.php
@@ -284,8 +284,6 @@ public function getParameters()
     /**
      * Sets the parameters.
      *
-     * @param array $parameters The parameters
-     *
      * @return $this
      */
     public function setParameters(array $parameters)
diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
index 41525e0d8166b..62f2f258ce9c2 100644
--- a/src/Symfony/Component/Routing/Route.php
+++ b/src/Symfony/Component/Routing/Route.php
@@ -296,8 +296,6 @@ public function getOptions()
      *
      * This method implements a fluent interface.
      *
-     * @param array $options The options
-     *
      * @return $this
      */
     public function setOptions(array $options)
@@ -314,8 +312,6 @@ public function setOptions(array $options)
      *
      * This method implements a fluent interface.
      *
-     * @param array $options The options
-     *
      * @return $this
      */
     public function addOptions(array $options)
@@ -385,8 +381,6 @@ public function getDefaults()
      *
      * This method implements a fluent interface.
      *
-     * @param array $defaults The defaults
-     *
      * @return $this
      */
     public function setDefaults(array $defaults)
@@ -401,8 +395,6 @@ public function setDefaults(array $defaults)
      *
      * This method implements a fluent interface.
      *
-     * @param array $defaults The defaults
-     *
      * @return $this
      */
     public function addDefaults(array $defaults)
@@ -470,8 +462,6 @@ public function getRequirements()
      *
      * This method implements a fluent interface.
      *
-     * @param array $requirements The requirements
-     *
      * @return $this
      */
     public function setRequirements(array $requirements)
@@ -486,8 +476,6 @@ public function setRequirements(array $requirements)
      *
      * This method implements a fluent interface.
      *
-     * @param array $requirements The requirements
-     *
      * @return $this
      */
     public function addRequirements(array $requirements)
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
index 3ae7b4147d134..dec591ae7a301 100644
--- a/src/Symfony/Component/Routing/RouteCollection.php
+++ b/src/Symfony/Component/Routing/RouteCollection.php
@@ -69,8 +69,7 @@ public function count()
     /**
      * Adds a route.
      *
-     * @param string $name  The route name
-     * @param Route  $route A Route instance
+     * @param string $name The route name
      */
     public function add($name, Route $route)
     {
diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
index 52d7c35080b5a..389ddf53384d7 100644
--- a/src/Symfony/Component/Routing/Router.php
+++ b/src/Symfony/Component/Routing/Router.php
@@ -84,11 +84,8 @@ class Router implements RouterInterface, RequestMatcherInterface
     private $expressionLanguageProviders = array();
 
     /**
-     * @param LoaderInterface $loader   A LoaderInterface instance
-     * @param mixed           $resource The main resource to load
-     * @param array           $options  An array of options
-     * @param RequestContext  $context  The context
-     * @param LoggerInterface $logger   A logger instance
+     * @param mixed $resource The main resource to load
+     * @param array $options  An array of options
      */
     public function __construct(LoaderInterface $loader, $resource, array $options = array(), RequestContext $context = null, LoggerInterface $logger = null)
     {
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
index 69c394c67abf5..ab780569b2c86 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
@@ -331,9 +331,6 @@ public function getRouteCollections()
         );
     }
 
-    /**
-     * @param $dumper
-     */
     private function generateDumpedMatcher(RouteCollection $collection, $redirectableStub = false)
     {
         $options = array('class' => $this->matcherClass);
diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
index cf65b6fb1d7b5..a69ecd33af4c3 100644
--- a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
+++ b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
@@ -313,8 +313,7 @@ protected function getAncestorLookupSql(array $batch)
      * Constructs the SQL for retrieving child object identities for the given
      * object identities.
      *
-     * @param ObjectIdentityInterface $oid
-     * @param bool                    $directChildrenOnly
+     * @param bool $directChildrenOnly
      *
      * @return string
      */
diff --git a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
index d7e87ec3ca660..a07239c6963c6 100644
--- a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
+++ b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
@@ -366,8 +366,7 @@ public function updateAcl(MutableAclInterface $acl)
     /**
      * Updates a user security identity when the user's username changes.
      *
-     * @param UserSecurityIdentity $usid
-     * @param string               $oldUsername
+     * @param string $oldUsername
      */
     public function updateUserSecurityIdentity(UserSecurityIdentity $usid, $oldUsername)
     {
@@ -661,8 +660,7 @@ protected function getDeleteSecurityIdentityIdSql(SecurityIdentityInterface $sid
     /**
      * Constructs the SQL for updating an object identity.
      *
-     * @param int   $pk
-     * @param array $changes
+     * @param int $pk
      *
      * @return string
      *
@@ -685,8 +683,7 @@ protected function getUpdateObjectIdentitySql($pk, array $changes)
     /**
      * Constructs the SQL for updating a user security identity.
      *
-     * @param UserSecurityIdentity $usid
-     * @param string               $oldUsername
+     * @param string $oldUsername
      *
      * @return string
      */
@@ -711,8 +708,7 @@ protected function getUpdateUserSecurityIdentitySql(UserSecurityIdentity $usid,
     /**
      * Constructs the SQL for updating an ACE.
      *
-     * @param int   $pk
-     * @param array $sets
+     * @param int $pk
      *
      * @return string
      *
@@ -832,7 +828,6 @@ private function regenerateAncestorRelations(AclInterface $acl)
      * This processes new entries changes on an ACE related property (classFieldAces, or objectFieldAces).
      *
      * @param string $name
-     * @param array  $changes
      */
     private function updateNewFieldAceProperty($name, array $changes)
     {
@@ -874,7 +869,6 @@ private function updateNewFieldAceProperty($name, array $changes)
      * This processes old entries changes on an ACE related property (classFieldAces, or objectFieldAces).
      *
      * @param string $name
-     * @param array  $changes
      */
     private function updateOldFieldAceProperty($name, array $changes)
     {
@@ -905,7 +899,6 @@ private function updateOldFieldAceProperty($name, array $changes)
      * This processes new entries changes on an ACE related property (classAces, or objectAces).
      *
      * @param string $name
-     * @param array  $changes
      */
     private function updateNewAceProperty($name, array $changes)
     {
@@ -947,7 +940,6 @@ private function updateNewAceProperty($name, array $changes)
      * This processes old entries changes on an ACE related property (classAces, or objectAces).
      *
      * @param string $name
-     * @param array  $changes
      */
     private function updateOldAceProperty($name, array $changes)
     {
diff --git a/src/Symfony/Component/Security/Acl/Dbal/Schema.php b/src/Symfony/Component/Security/Acl/Dbal/Schema.php
index 001670a422029..aab3ff55949ea 100644
--- a/src/Symfony/Component/Security/Acl/Dbal/Schema.php
+++ b/src/Symfony/Component/Security/Acl/Dbal/Schema.php
@@ -24,8 +24,7 @@ final class Schema extends BaseSchema
     private $options;
 
     /**
-     * @param array      $options    The names for tables
-     * @param Connection $connection
+     * @param array $options The names for tables
      */
     public function __construct(array $options, Connection $connection = null)
     {
diff --git a/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php
index eee8d4df95281..2b99c0422d286 100644
--- a/src/Symfony/Component/Security/Acl/Domain/Acl.php
+++ b/src/Symfony/Component/Security/Acl/Domain/Acl.php
@@ -48,11 +48,8 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
     private $listeners = array();
 
     /**
-     * @param int                                 $id
-     * @param ObjectIdentityInterface             $objectIdentity
-     * @param PermissionGrantingStrategyInterface $permissionGrantingStrategy
-     * @param array                               $loadedSids
-     * @param bool                                $entriesInheriting
+     * @param int  $id
+     * @param bool $entriesInheriting
      */
     public function __construct($id, ObjectIdentityInterface $objectIdentity, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $loadedSids, $entriesInheriting)
     {
@@ -436,12 +433,11 @@ private function deleteFieldAce($property, $index, $field)
     /**
      * Inserts an ACE.
      *
-     * @param string                    $property
-     * @param int                       $index
-     * @param int                       $mask
-     * @param SecurityIdentityInterface $sid
-     * @param bool                      $granting
-     * @param string                    $strategy
+     * @param string $property
+     * @param int    $index
+     * @param int    $mask
+     * @param bool   $granting
+     * @param string $strategy
      *
      * @throws \OutOfBoundsException
      * @throws \InvalidArgumentException
@@ -485,13 +481,12 @@ private function insertAce($property, $index, $mask, SecurityIdentityInterface $
     /**
      * Inserts a field-based ACE.
      *
-     * @param string                    $property
-     * @param int                       $index
-     * @param string                    $field
-     * @param int                       $mask
-     * @param SecurityIdentityInterface $sid
-     * @param bool                      $granting
-     * @param string                    $strategy
+     * @param string $property
+     * @param int    $index
+     * @param string $field
+     * @param int    $mask
+     * @param bool   $granting
+     * @param string $strategy
      *
      * @throws \InvalidArgumentException
      * @throws \OutOfBoundsException
@@ -571,10 +566,9 @@ private function updateAce($property, $index, $mask, $strategy = null)
     /**
      * Updates auditing for an ACE.
      *
-     * @param array &$aces
-     * @param int   $index
-     * @param bool  $auditSuccess
-     * @param bool  $auditFailure
+     * @param int  $index
+     * @param bool $auditSuccess
+     * @param bool $auditFailure
      *
      * @throws \OutOfBoundsException
      */
@@ -646,10 +640,9 @@ private function onPropertyChanged($name, $oldValue, $newValue)
     /**
      * Called when a property of an ACE associated with this ACL changes.
      *
-     * @param EntryInterface $entry
-     * @param string         $name
-     * @param mixed          $oldValue
-     * @param mixed          $newValue
+     * @param string $name
+     * @param mixed  $oldValue
+     * @param mixed  $newValue
      */
     private function onEntryPropertyChanged(EntryInterface $entry, $name, $oldValue, $newValue)
     {
diff --git a/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php b/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php
index e3f3bdd29568b..41cca3a293dfb 100644
--- a/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php
+++ b/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php
@@ -25,8 +25,7 @@ abstract class AuditLogger implements AuditLoggerInterface
     /**
      * Performs some checks if logging was requested.
      *
-     * @param bool           $granted
-     * @param EntryInterface $ace
+     * @param bool $granted
      */
     public function logIfNeeded($granted, EntryInterface $ace)
     {
@@ -44,8 +43,7 @@ public function logIfNeeded($granted, EntryInterface $ace)
     /**
      * This method is only called when logging is needed.
      *
-     * @param bool           $granted
-     * @param EntryInterface $ace
+     * @param bool $granted
      */
     abstract protected function doLog($granted, EntryInterface $ace);
 }
diff --git a/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php b/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php
index 4ff22eacce138..706d9a82fb235 100644
--- a/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php
+++ b/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php
@@ -32,9 +32,7 @@ class DoctrineAclCache implements AclCacheInterface
     private $permissionGrantingStrategy;
 
     /**
-     * @param Cache                               $cache
-     * @param PermissionGrantingStrategyInterface $permissionGrantingStrategy
-     * @param string                              $prefix
+     * @param string $prefix
      *
      * @throws \InvalidArgumentException
      */
diff --git a/src/Symfony/Component/Security/Acl/Domain/Entry.php b/src/Symfony/Component/Security/Acl/Domain/Entry.php
index 57795632ad178..6348612d28725 100644
--- a/src/Symfony/Component/Security/Acl/Domain/Entry.php
+++ b/src/Symfony/Component/Security/Acl/Domain/Entry.php
@@ -32,14 +32,12 @@ class Entry implements AuditableEntryInterface
     private $granting;
 
     /**
-     * @param int                       $id
-     * @param AclInterface              $acl
-     * @param SecurityIdentityInterface $sid
-     * @param string                    $strategy
-     * @param int                       $mask
-     * @param bool                      $granting
-     * @param bool                      $auditFailure
-     * @param bool                      $auditSuccess
+     * @param int    $id
+     * @param string $strategy
+     * @param int    $mask
+     * @param bool   $granting
+     * @param bool   $auditFailure
+     * @param bool   $auditSuccess
      */
     public function __construct($id, AclInterface $acl, SecurityIdentityInterface $sid, $strategy, $mask, $granting, $auditFailure, $auditSuccess)
     {
diff --git a/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php b/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php
index 6f4563ffcc6c4..ca638997569c4 100644
--- a/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php
+++ b/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php
@@ -25,15 +25,13 @@ class FieldEntry extends Entry implements FieldEntryInterface
     private $field;
 
     /**
-     * @param int                       $id
-     * @param AclInterface              $acl
-     * @param string                    $field
-     * @param SecurityIdentityInterface $sid
-     * @param string                    $strategy
-     * @param int                       $mask
-     * @param bool                      $granting
-     * @param bool                      $auditFailure
-     * @param bool                      $auditSuccess
+     * @param int    $id
+     * @param string $field
+     * @param string $strategy
+     * @param int    $mask
+     * @param bool   $granting
+     * @param bool   $auditFailure
+     * @param bool   $auditSuccess
      */
     public function __construct($id, AclInterface $acl, $field, SecurityIdentityInterface $sid, $strategy, $mask, $granting, $auditFailure, $auditSuccess)
     {
diff --git a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php
index 6710a1b922d21..61c18a1ed3eb7 100644
--- a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php
+++ b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php
@@ -119,7 +119,6 @@ public function isFieldGranted(AclInterface $acl, $field, array $masks, array $s
      * permission/identity combinations are left. Finally, we will either throw
      * an NoAceFoundException, or deny access.
      *
-     * @param AclInterface                $acl
      * @param EntryInterface[]            $aces               An array of ACE to check against
      * @param array                       $masks              An array of permission masks
      * @param SecurityIdentityInterface[] $sids               An array of SecurityIdentityInterface implementations
@@ -183,8 +182,7 @@ private function hasSufficientPermissions(AclInterface $acl, array $aces, array
      * Strategy EQUAL:
      * The ACE will be considered applicable when the bitmasks are equal.
      *
-     * @param int            $requiredMask
-     * @param EntryInterface $ace
+     * @param int $requiredMask
      *
      * @return bool
      *
diff --git a/src/Symfony/Component/Security/Acl/Exception/NotAllAclsFoundException.php b/src/Symfony/Component/Security/Acl/Exception/NotAllAclsFoundException.php
index a6343823ad51a..dbce70c495fd8 100644
--- a/src/Symfony/Component/Security/Acl/Exception/NotAllAclsFoundException.php
+++ b/src/Symfony/Component/Security/Acl/Exception/NotAllAclsFoundException.php
@@ -26,8 +26,6 @@ class NotAllAclsFoundException extends AclNotFoundException
 
     /**
      * Sets the partial result.
-     *
-     * @param \SplObjectStorage $result
      */
     public function setPartialResult(\SplObjectStorage $result)
     {
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php
index b7b7f51d209fe..82a47207392d2 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php
@@ -32,11 +32,8 @@ class DaoAuthenticationProvider extends UserAuthenticationProvider
     private $userProvider;
 
     /**
-     * @param UserProviderInterface   $userProvider               An UserProviderInterface instance
-     * @param UserCheckerInterface    $userChecker                An UserCheckerInterface instance
-     * @param string                  $providerKey                The provider key
-     * @param EncoderFactoryInterface $encoderFactory             An EncoderFactoryInterface instance
-     * @param bool                    $hideUserNotFoundExceptions Whether to hide user not found exception or not
+     * @param string $providerKey                The provider key
+     * @param bool   $hideUserNotFoundExceptions Whether to hide user not found exception or not
      */
     public function __construct(UserProviderInterface $userProvider, UserCheckerInterface $userChecker, $providerKey, EncoderFactoryInterface $encoderFactory, $hideUserNotFoundExceptions = true)
     {
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
index 3f70b4718b837..6706617eaee6b 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
@@ -128,8 +128,7 @@ private function getRoles(UserInterface $user, TokenInterface $token)
     /**
      * Retrieves the user from an implementation-specific location.
      *
-     * @param string                $username The username to retrieve
-     * @param UsernamePasswordToken $token    The Token
+     * @param string $username The username to retrieve
      *
      * @return UserInterface The user
      *
diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php
index c6b76c2e6b038..95e86f0b0d6f8 100644
--- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php
@@ -25,11 +25,10 @@ final class PersistentToken implements PersistentTokenInterface
     private $lastUsed;
 
     /**
-     * @param string    $class
-     * @param string    $username
-     * @param string    $series
-     * @param string    $tokenValue
-     * @param \DateTime $lastUsed
+     * @param string $class
+     * @param string $username
+     * @param string $series
+     * @param string $tokenValue
      *
      * @throws \InvalidArgumentException
      */
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php
index c72a34b1cc768..4821436eedeca 100644
--- a/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php
+++ b/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php
@@ -24,9 +24,8 @@ class RememberMeToken extends AbstractToken
     private $providerKey;
 
     /**
-     * @param UserInterface $user
-     * @param string        $providerKey
-     * @param string        $key
+     * @param string $providerKey
+     * @param string $key
      *
      * @throws \InvalidArgumentException
      */
diff --git a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
index 4ada017d013a7..2d4e05def02d7 100644
--- a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
+++ b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
@@ -31,10 +31,7 @@ class AuthorizationChecker implements AuthorizationCheckerInterface
     private $alwaysAuthenticate;
 
     /**
-     * @param TokenStorageInterface          $tokenStorage
-     * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManager instance
-     * @param AccessDecisionManagerInterface $accessDecisionManager An AccessDecisionManager instance
-     * @param bool                           $alwaysAuthenticate
+     * @param bool $alwaysAuthenticate
      */
     public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, AccessDecisionManagerInterface $accessDecisionManager, $alwaysAuthenticate = false)
     {
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php
index 3d8bbc2d3f987..d8c33d4436160 100644
--- a/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php
+++ b/src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php
@@ -50,9 +50,8 @@ public function supportsClass($class)
      * If at least one attribute is supported, but access not granted, then ACCESS_DENIED is returned
      * Otherwise it will return ACCESS_ABSTAIN
      *
-     * @param TokenInterface $token      A TokenInterface instance
-     * @param object         $object     The object to secure
-     * @param array          $attributes An array of attributes associated with the method being invoked
+     * @param object $object     The object to secure
+     * @param array  $attributes An array of attributes associated with the method being invoked
      *
      * @return int either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED
      */
diff --git a/src/Symfony/Component/Security/Http/AccessMap.php b/src/Symfony/Component/Security/Http/AccessMap.php
index acd4101e72a97..0a62435df9b5e 100644
--- a/src/Symfony/Component/Security/Http/AccessMap.php
+++ b/src/Symfony/Component/Security/Http/AccessMap.php
@@ -25,9 +25,8 @@ class AccessMap implements AccessMapInterface
     private $map = array();
 
     /**
-     * @param RequestMatcherInterface $requestMatcher A RequestMatcherInterface instance
-     * @param array                   $attributes     An array of attributes to pass to the access decision manager (like roles)
-     * @param string|null             $channel        The channel to enforce (http, https, or null)
+     * @param array       $attributes An array of attributes to pass to the access decision manager (like roles)
+     * @param string|null $channel    The channel to enforce (http, https, or null)
      */
     public function add(RequestMatcherInterface $requestMatcher, array $attributes = array(), $channel = null)
     {
diff --git a/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationFailureHandler.php b/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationFailureHandler.php
index 1440179131ab7..f49f1808fd0ee 100644
--- a/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationFailureHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationFailureHandler.php
@@ -22,8 +22,7 @@ class CustomAuthenticationFailureHandler implements AuthenticationFailureHandler
     private $handler;
 
     /**
-     * @param AuthenticationFailureHandlerInterface $handler An AuthenticationFailureHandlerInterface instance
-     * @param array                                 $options Options for processing a successful authentication attempt
+     * @param array $options Options for processing a successful authentication attempt
      */
     public function __construct(AuthenticationFailureHandlerInterface $handler, array $options)
     {
diff --git a/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationSuccessHandler.php
index 369e2d14c7893..78b31fa25cebd 100644
--- a/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationSuccessHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationSuccessHandler.php
@@ -22,9 +22,8 @@ class CustomAuthenticationSuccessHandler implements AuthenticationSuccessHandler
     private $handler;
 
     /**
-     * @param AuthenticationSuccessHandlerInterface $handler     An AuthenticationSuccessHandlerInterface instance
-     * @param array                                 $options     Options for processing a successful authentication attempt
-     * @param string                                $providerKey The provider key
+     * @param array  $options     Options for processing a successful authentication attempt
+     * @param string $providerKey The provider key
      */
     public function __construct(AuthenticationSuccessHandlerInterface $handler, array $options, $providerKey)
     {
diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
index 0099e792f8f2c..75688a8a3bbdc 100644
--- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
@@ -36,8 +36,7 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle
     );
 
     /**
-     * @param HttpUtils $httpUtils
-     * @param array     $options   Options for processing a successful authentication attempt
+     * @param array $options Options for processing a successful authentication attempt
      */
     public function __construct(HttpUtils $httpUtils, array $options = array())
     {
diff --git a/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php b/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php
index 669dc13489fec..737817684910b 100644
--- a/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/SimpleAuthenticationHandler.php
@@ -35,7 +35,6 @@ class SimpleAuthenticationHandler implements AuthenticationFailureHandlerInterfa
     protected $logger;
 
     /**
-     * @param SimpleAuthenticatorInterface          $authenticator  SimpleAuthenticatorInterface instance
      * @param AuthenticationSuccessHandlerInterface $successHandler Default success handler
      * @param AuthenticationFailureHandlerInterface $failureHandler Default failure handler
      * @param LoggerInterface                       $logger         Optional logger
diff --git a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php
index 35ee02f5401dc..5a141642e9653 100644
--- a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php
+++ b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php
@@ -29,10 +29,8 @@ class FormAuthenticationEntryPoint implements AuthenticationEntryPointInterface
     private $httpUtils;
 
     /**
-     * @param HttpKernelInterface $kernel
-     * @param HttpUtils           $httpUtils  An HttpUtils instance
-     * @param string              $loginPath  The path to the login form
-     * @param bool                $useForward Whether to forward or redirect to the login form
+     * @param string $loginPath  The path to the login form
+     * @param bool   $useForward Whether to forward or redirect to the login form
      */
     public function __construct(HttpKernelInterface $kernel, HttpUtils $httpUtils, $loginPath, $useForward = false)
     {
diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
index 71a9311a93e3f..685dd55f7af75 100644
--- a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
@@ -64,17 +64,11 @@ abstract class AbstractAuthenticationListener implements ListenerInterface
     private $rememberMeServices;
 
     /**
-     * @param TokenStorageInterface                  $tokenStorage          A TokenStorageInterface instance
-     * @param AuthenticationManagerInterface         $authenticationManager An AuthenticationManagerInterface instance
-     * @param SessionAuthenticationStrategyInterface $sessionStrategy
-     * @param HttpUtils                              $httpUtils             An HttpUtils instance
-     * @param string                                 $providerKey
-     * @param AuthenticationSuccessHandlerInterface  $successHandler
-     * @param AuthenticationFailureHandlerInterface  $failureHandler
-     * @param array                                  $options               An array of options for the processing of a
-     *                                                                      successful, or failed authentication attempt
-     * @param LoggerInterface|null                   $logger                A LoggerInterface instance
-     * @param EventDispatcherInterface|null          $dispatcher            An EventDispatcherInterface instance
+     * @param string                        $providerKey
+     * @param array                         $options     An array of options for the processing of a
+     *                                                   successful, or failed authentication attempt
+     * @param LoggerInterface|null          $logger      A LoggerInterface instance
+     * @param EventDispatcherInterface|null $dispatcher  An EventDispatcherInterface instance
      *
      * @throws \InvalidArgumentException
      */
diff --git a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
index 907d298b4ab32..e7c91997dba57 100644
--- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
@@ -40,9 +40,6 @@ class LogoutListener implements ListenerInterface
     private $csrfTokenManager;
 
     /**
-     * @param TokenStorageInterface          $tokenStorage
-     * @param HttpUtils                      $httpUtils        An HttpUtils instance
-     * @param LogoutSuccessHandlerInterface  $successHandler   A LogoutSuccessHandlerInterface instance
      * @param array                          $options          An array of options to process a logout attempt
      * @param CsrfTokenManagerInterface|null $csrfTokenManager A CsrfTokenManagerInterface instance
      */
diff --git a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
index fe670f3de1f38..ab0e9dc1638cd 100644
--- a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
@@ -39,9 +39,6 @@ class RememberMeListener implements ListenerInterface
     private $sessionStrategy;
 
     /**
-     * @param TokenStorageInterface                       $tokenStorage
-     * @param RememberMeServicesInterface                 $rememberMeServices
-     * @param AuthenticationManagerInterface              $authenticationManager
      * @param LoggerInterface|null                        $logger
      * @param EventDispatcherInterface|null               $dispatcher
      * @param bool                                        $catchExceptions
diff --git a/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
index 9b6bfd1a3f3d2..07c6018ff7e78 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
@@ -40,19 +40,13 @@ class SimpleFormAuthenticationListener extends AbstractAuthenticationListener
     private $csrfTokenManager;
 
     /**
-     * @param TokenStorageInterface                  $tokenStorage          A TokenStorageInterface instance
-     * @param AuthenticationManagerInterface         $authenticationManager An AuthenticationManagerInterface instance
-     * @param SessionAuthenticationStrategyInterface $sessionStrategy
-     * @param HttpUtils                              $httpUtils             An HttpUtils instance
-     * @param string                                 $providerKey
-     * @param AuthenticationSuccessHandlerInterface  $successHandler
-     * @param AuthenticationFailureHandlerInterface  $failureHandler
-     * @param array                                  $options               An array of options for the processing of a
-     *                                                                      successful, or failed authentication attempt
-     * @param LoggerInterface|null                   $logger                A LoggerInterface instance
-     * @param EventDispatcherInterface|null          $dispatcher            An EventDispatcherInterface instance
-     * @param CsrfTokenManagerInterface|null         $csrfTokenManager      A CsrfTokenManagerInterface instance
-     * @param SimpleFormAuthenticatorInterface|null  $simpleAuthenticator   A SimpleFormAuthenticatorInterface instance
+     * @param string                                $providerKey
+     * @param array                                 $options             An array of options for the processing of a
+     *                                                                   successful, or failed authentication attempt
+     * @param LoggerInterface|null                  $logger              A LoggerInterface instance
+     * @param EventDispatcherInterface|null         $dispatcher          An EventDispatcherInterface instance
+     * @param CsrfTokenManagerInterface|null        $csrfTokenManager    A CsrfTokenManagerInterface instance
+     * @param SimpleFormAuthenticatorInterface|null $simpleAuthenticator A SimpleFormAuthenticatorInterface instance
      *
      * @throws \InvalidArgumentException In case no simple authenticator is provided
      * @throws InvalidArgumentException  In case an invalid CSRF token manager is passed
diff --git a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php
index dd51869405547..fdcbfc1f23779 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SimplePreAuthenticationListener.php
@@ -40,12 +40,9 @@ class SimplePreAuthenticationListener implements ListenerInterface
     private $dispatcher;
 
     /**
-     * @param TokenStorageInterface           $tokenStorage          A TokenStorageInterface instance
-     * @param AuthenticationManagerInterface  $authenticationManager An AuthenticationManagerInterface instance
-     * @param string                          $providerKey
-     * @param SimplePreAuthenticatorInterface $simpleAuthenticator   A SimplePreAuthenticatorInterface instance
-     * @param LoggerInterface|null            $logger                A LoggerInterface instance
-     * @param EventDispatcherInterface|null   $dispatcher            An EventDispatcherInterface instance
+     * @param string                        $providerKey
+     * @param LoggerInterface|null          $logger      A LoggerInterface instance
+     * @param EventDispatcherInterface|null $dispatcher  An EventDispatcherInterface instance
      */
     public function __construct(TokenStorageInterface $tokenStorage, AuthenticationManagerInterface $authenticationManager, $providerKey, SimplePreAuthenticatorInterface $simpleAuthenticator, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null)
     {
diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php
index 30071b880de16..d40c2d1ec9dd6 100644
--- a/src/Symfony/Component/Security/Http/HttpUtils.php
+++ b/src/Symfony/Component/Security/Http/HttpUtils.php
@@ -32,7 +32,6 @@ class HttpUtils
     private $domainRegexp;
 
     /**
-     * @param UrlGeneratorInterface                       $urlGenerator A UrlGeneratorInterface instance
      * @param UrlMatcherInterface|RequestMatcherInterface $urlMatcher   The URL or Request matcher
      * @param string|null                                 $domainRegexp A regexp that the target of HTTP redirections must match, scheme included
      *
@@ -51,9 +50,8 @@ public function __construct(UrlGeneratorInterface $urlGenerator = null, $urlMatc
     /**
      * Creates a redirect Response.
      *
-     * @param Request $request A Request instance
-     * @param string  $path    A path (an absolute path (/foo), an absolute URL (http://...), or a route name (foo))
-     * @param int     $status  The status code
+     * @param string $path   A path (an absolute path (/foo), an absolute URL (http://...), or a route name (foo))
+     * @param int    $status The status code
      *
      * @return RedirectResponse A RedirectResponse instance
      */
@@ -97,8 +95,7 @@ public function createRequest(Request $request, $path)
     /**
      * Checks that a given path matches the Request.
      *
-     * @param Request $request A Request instance
-     * @param string  $path    A path (an absolute path (/foo), an absolute URL (http://...), or a route name (foo))
+     * @param string $path A path (an absolute path (/foo), an absolute URL (http://...), or a route name (foo))
      *
      * @return bool true if the path is the same as the one from the Request, false otherwise
      */
diff --git a/src/Symfony/Component/Security/Http/Logout/DefaultLogoutSuccessHandler.php b/src/Symfony/Component/Security/Http/Logout/DefaultLogoutSuccessHandler.php
index 48626b0690356..b0519c0db7bd1 100644
--- a/src/Symfony/Component/Security/Http/Logout/DefaultLogoutSuccessHandler.php
+++ b/src/Symfony/Component/Security/Http/Logout/DefaultLogoutSuccessHandler.php
@@ -26,8 +26,7 @@ class DefaultLogoutSuccessHandler implements LogoutSuccessHandlerInterface
     protected $targetUrl;
 
     /**
-     * @param HttpUtils $httpUtils
-     * @param string    $targetUrl
+     * @param string $targetUrl
      */
     public function __construct(HttpUtils $httpUtils, $targetUrl = '/')
     {
diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
index c895342d3af2b..b6c205a1eb8f5 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
@@ -43,11 +43,8 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
     private $userProviders;
 
     /**
-     * @param array           $userProviders
-     * @param string          $key
-     * @param string          $providerKey
-     * @param array           $options
-     * @param LoggerInterface $logger
+     * @param string $key
+     * @param string $providerKey
      *
      * @throws \InvalidArgumentException
      */
diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
index 8c56d6a80810b..29994addef4fb 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
@@ -36,12 +36,8 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices
     private $secureRandom;
 
     /**
-     * @param array                 $userProviders
-     * @param string                $key
-     * @param string                $providerKey
-     * @param array                 $options
-     * @param LoggerInterface       $logger
-     * @param SecureRandomInterface $secureRandom
+     * @param string $key
+     * @param string $providerKey
      */
     public function __construct(array $userProviders, $key, $providerKey, array $options, LoggerInterface $logger = null, SecureRandomInterface $secureRandom)
     {
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index 005b565d12113..666bfa1018d04 100644
--- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -172,8 +172,7 @@ public function getRootNodeName()
     }
 
     /**
-     * @param \DOMNode $node
-     * @param string   $val
+     * @param string $val
      *
      * @return bool
      */
@@ -191,8 +190,7 @@ final protected function appendXMLString(\DOMNode $node, $val)
     }
 
     /**
-     * @param \DOMNode $node
-     * @param string   $val
+     * @param string $val
      *
      * @return bool
      */
@@ -205,8 +203,7 @@ final protected function appendText(\DOMNode $node, $val)
     }
 
     /**
-     * @param \DOMNode $node
-     * @param string   $val
+     * @param string $val
      *
      * @return bool
      */
@@ -219,7 +216,6 @@ final protected function appendCData(\DOMNode $node, $val)
     }
 
     /**
-     * @param \DOMNode             $node
      * @param \DOMDocumentFragment $fragment
      *
      * @return bool
@@ -362,7 +358,6 @@ private function parseXmlValue(\DOMNode $node)
     /**
      * Parse the data and convert it to DOMElements.
      *
-     * @param \DOMNode     $parentNode
      * @param array|object $data
      * @param string|null  $xmlRootNodeName
      *
@@ -431,7 +426,6 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
     /**
      * Selects the type of node to create and appends it to the parent.
      *
-     * @param \DOMNode     $parentNode
      * @param array|object $data
      * @param string       $nodeName
      * @param string       $key
@@ -468,8 +462,7 @@ private function needsCdataWrapping($val)
     /**
      * Tests the value being passed and decide what sort of element to create.
      *
-     * @param \DOMNode $node
-     * @param mixed    $val
+     * @param mixed $val
      *
      * @return bool
      *
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
index 031bcf7d08c5c..912da525739bd 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -150,8 +150,6 @@ public function setIgnoredAttributes(array $ignoredAttributes)
      *
      * @deprecated Deprecated since version 2.7, to be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.
      *
-     * @param array $camelizedAttributes
-     *
      * @return self
      *
      * @throws LogicException
@@ -246,7 +244,6 @@ protected function formatAttribute($attributeName)
      * Gets attributes to normalize using groups.
      *
      * @param string|object $classOrObject
-     * @param array         $context
      * @param bool          $attributesAsString If false, return an array of {@link AttributeMetadataInterface}
      *
      * @return string[]|AttributeMetadataInterface[]|bool
@@ -288,11 +285,8 @@ protected function prepareForDenormalization($data)
      * is removed from the context before being returned to avoid side effects
      * when recursively normalizing an object graph.
      *
-     * @param array            $data
-     * @param string           $class
-     * @param array            $context
-     * @param \ReflectionClass $reflectionClass
-     * @param array|bool       $allowedAttributes
+     * @param string     $class
+     * @param array|bool $allowedAttributes
      *
      * @return object
      *
diff --git a/src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php b/src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php
index a246a1b52251c..3ee67c9d440de 100644
--- a/src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php
+++ b/src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php
@@ -35,8 +35,7 @@ class CoreAssetsHelper extends Helper implements PackageInterface
     protected $namedPackages = array();
 
     /**
-     * @param PackageInterface $defaultPackage The default package
-     * @param array            $namedPackages  Additional packages indexed by name
+     * @param array $namedPackages Additional packages indexed by name
      */
     public function __construct(PackageInterface $defaultPackage, array $namedPackages = array())
     {
@@ -55,8 +54,7 @@ public function setDefaultPackage(PackageInterface $defaultPackage)
     /**
      * Adds an asset package to the helper.
      *
-     * @param string           $name    The package name
-     * @param PackageInterface $package The package
+     * @param string $name The package name
      */
     public function addPackage($name, PackageInterface $package)
     {
diff --git a/src/Symfony/Component/Templating/Loader/CacheLoader.php b/src/Symfony/Component/Templating/Loader/CacheLoader.php
index d23c6b5837927..d909758f8647c 100644
--- a/src/Symfony/Component/Templating/Loader/CacheLoader.php
+++ b/src/Symfony/Component/Templating/Loader/CacheLoader.php
@@ -30,8 +30,7 @@ class CacheLoader extends Loader
     protected $dir;
 
     /**
-     * @param LoaderInterface $loader A Loader instance
-     * @param string          $dir    The directory where to store the cache files
+     * @param string $dir The directory where to store the cache files
      */
     public function __construct(LoaderInterface $loader, $dir)
     {
@@ -87,8 +86,7 @@ public function load(TemplateReferenceInterface $template)
     /**
      * Returns true if the template is still fresh.
      *
-     * @param TemplateReferenceInterface $template A template
-     * @param int                        $time     The last modification time of the cached template (timestamp)
+     * @param int $time The last modification time of the cached template (timestamp)
      *
      * @return bool
      */
diff --git a/src/Symfony/Component/Templating/Loader/ChainLoader.php b/src/Symfony/Component/Templating/Loader/ChainLoader.php
index d66139e0b3ffa..6221a284f6773 100644
--- a/src/Symfony/Component/Templating/Loader/ChainLoader.php
+++ b/src/Symfony/Component/Templating/Loader/ChainLoader.php
@@ -60,8 +60,7 @@ public function load(TemplateReferenceInterface $template)
     /**
      * Returns true if the template is still fresh.
      *
-     * @param TemplateReferenceInterface $template A template
-     * @param int                        $time     The last modification time of the cached template (timestamp)
+     * @param int $time The last modification time of the cached template (timestamp)
      *
      * @return bool
      */
diff --git a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
index 79a7a6a3eadd3..6de23a3ac4c76 100644
--- a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
+++ b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
@@ -84,8 +84,7 @@ public function load(TemplateReferenceInterface $template)
     /**
      * Returns true if the template is still fresh.
      *
-     * @param TemplateReferenceInterface $template A template
-     * @param int                        $time     The last modification time of the cached template (timestamp)
+     * @param int $time The last modification time of the cached template (timestamp)
      *
      * @return bool true if the template is still fresh, false otherwise
      */
diff --git a/src/Symfony/Component/Templating/Loader/Loader.php b/src/Symfony/Component/Templating/Loader/Loader.php
index d3d16dd47d0b6..8279d95911cab 100644
--- a/src/Symfony/Component/Templating/Loader/Loader.php
+++ b/src/Symfony/Component/Templating/Loader/Loader.php
@@ -42,8 +42,6 @@ public function setLogger(LoggerInterface $logger)
     /**
      * Sets the debugger to use for this loader.
      *
-     * @param DebuggerInterface $debugger A debugger instance
-     *
      * @deprecated since version 2.4, to be removed in 3.0. Use $this->setLogger() instead.
      */
     public function setDebugger(DebuggerInterface $debugger)
diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php
index 25005bfcb0add..7655dd9ef4004 100644
--- a/src/Symfony/Component/Templating/PhpEngine.php
+++ b/src/Symfony/Component/Templating/PhpEngine.php
@@ -43,9 +43,7 @@ class PhpEngine implements EngineInterface, \ArrayAccess
     private $evalParameters;
 
     /**
-     * @param TemplateNameParserInterface $parser  A TemplateNameParserInterface instance
-     * @param LoaderInterface             $loader  A loader instance
-     * @param HelperInterface[]           $helpers An array of helper instances
+     * @param HelperInterface[] $helpers An array of helper instances
      */
     public function __construct(TemplateNameParserInterface $parser, LoaderInterface $loader, array $helpers = array())
     {
@@ -242,8 +240,7 @@ public function setHelpers(array $helpers)
     /**
      * Sets a helper.
      *
-     * @param HelperInterface $helper The helper instance
-     * @param string          $alias  An alias
+     * @param string $alias An alias
      */
     public function set(HelperInterface $helper, $alias = null)
     {
diff --git a/src/Symfony/Component/Translation/Dumper/FileDumper.php b/src/Symfony/Component/Translation/Dumper/FileDumper.php
index f2f17d64fde16..5a23b458eca8f 100644
--- a/src/Symfony/Component/Translation/Dumper/FileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/FileDumper.php
@@ -50,8 +50,6 @@ public function setRelativePathTemplate($relativePathTemplate)
 
     /**
      * Sets backup flag.
-     *
-     * @param bool
      */
     public function setBackup($backup)
     {
@@ -89,8 +87,7 @@ public function dump(MessageCatalogue $messages, $options = array())
     /**
      * Transforms a domain of a message catalogue to its string representation.
      *
-     * @param MessageCatalogue $messages
-     * @param string           $domain
+     * @param string $domain
      *
      * @return string representation
      */
diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php
index 93237ed3a2508..1dfeab526f0ce 100644
--- a/src/Symfony/Component/Translation/LoggingTranslator.php
+++ b/src/Symfony/Component/Translation/LoggingTranslator.php
@@ -27,7 +27,6 @@ class LoggingTranslator implements TranslatorInterface, TranslatorBagInterface
 
     /**
      * @param TranslatorInterface $translator The translator must implement TranslatorBagInterface
-     * @param LoggerInterface     $logger
      */
     public function __construct(TranslatorInterface $translator, LoggerInterface $logger)
     {
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
index b06d4976554ba..644fa5f4fbd1c 100644
--- a/src/Symfony/Component/Translation/Translator.php
+++ b/src/Symfony/Component/Translation/Translator.php
@@ -91,8 +91,7 @@ public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFa
     /**
      * Adds a Loader.
      *
-     * @param string          $format The name of the loader (@see addResource())
-     * @param LoaderInterface $loader A LoaderInterface instance
+     * @param string $format The name of the loader (@see addResource())
      */
     public function addLoader($format, LoaderInterface $loader)
     {
diff --git a/src/Symfony/Component/Translation/Writer/TranslationWriter.php b/src/Symfony/Component/Translation/Writer/TranslationWriter.php
index d34a93f282bb7..e5f119316870b 100644
--- a/src/Symfony/Component/Translation/Writer/TranslationWriter.php
+++ b/src/Symfony/Component/Translation/Writer/TranslationWriter.php
@@ -26,8 +26,7 @@ class TranslationWriter
     /**
      * Adds a dumper to the writer.
      *
-     * @param string          $format The format of the dumper
-     * @param DumperInterface $dumper The dumper
+     * @param string $format The format of the dumper
      */
     public function addDumper($format, DumperInterface $dumper)
     {
diff --git a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
index 14369c2365a52..5b1154a949288 100644
--- a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
@@ -88,8 +88,7 @@ class CardSchemeValidator extends ConstraintValidator
     /**
      * Validates a creditcard belongs to a specified scheme.
      *
-     * @param mixed      $value
-     * @param Constraint $constraint
+     * @param mixed $value
      */
     public function validate($value, Constraint $constraint)
     {
diff --git a/src/Symfony/Component/Validator/Constraints/LuhnValidator.php b/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
index e971ab153db5a..97904b0eaf422 100644
--- a/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
@@ -33,8 +33,7 @@ class LuhnValidator extends ConstraintValidator
     /**
      * Validates a credit card number with the Luhn algorithm.
      *
-     * @param mixed      $value
-     * @param Constraint $constraint
+     * @param mixed $value
      *
      * @throws UnexpectedTypeException when the given credit card number is no string
      */
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContext.php b/src/Symfony/Component/Validator/Context/ExecutionContext.php
index 5d04aa3050061..6d9f2cc4bc2d1 100644
--- a/src/Symfony/Component/Validator/Context/ExecutionContext.php
+++ b/src/Symfony/Component/Validator/Context/ExecutionContext.php
@@ -131,16 +131,14 @@ class ExecutionContext implements ExecutionContextInterface
     /**
      * Creates a new execution context.
      *
-     * @param ValidatorInterface  $validator         The validator
-     * @param mixed               $root              The root value of the
-     *                                               validated object graph
-     * @param TranslatorInterface $translator        The translator
-     * @param string|null         $translationDomain The translation domain to
-     *                                               use for translating
-     *                                               violation messages
+     * @param mixed       $root              The root value of the
+     *                                       validated object graph
+     * @param string|null $translationDomain The translation domain to
+     *                                       use for translating
+     *                                       violation messages
      *
      * @internal Called by {@link ExecutionContextFactory}. Should not be used
-     *           in user code.
+     * in user code.
      */
     public function __construct(ValidatorInterface $validator, $root, TranslatorInterface $translator, $translationDomain = null)
     {
diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php b/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php
index cbd9935443209..19b490196a591 100644
--- a/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php
+++ b/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php
@@ -30,10 +30,9 @@ class ExecutionContextFactory implements ExecutionContextFactoryInterface
     /**
      * Creates a new context factory.
      *
-     * @param TranslatorInterface $translator        The translator
-     * @param string|null         $translationDomain The translation domain to
-     *                                               use for translating
-     *                                               violation messages
+     * @param string|null $translationDomain The translation domain to
+     *                                       use for translating
+     *                                       violation messages
      */
     public function __construct(TranslatorInterface $translator, $translationDomain = null)
     {
diff --git a/src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php b/src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php
index 3cd4f79198c1d..7b69e3091d9b3 100644
--- a/src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php
+++ b/src/Symfony/Component/Validator/Context/LegacyExecutionContextFactory.php
@@ -35,11 +35,9 @@ class LegacyExecutionContextFactory implements ExecutionContextFactoryInterface
     /**
      * Creates a new context factory.
      *
-     * @param MetadataFactoryInterface $metadataFactory   The metadata factory
-     * @param TranslatorInterface      $translator        The translator
-     * @param string|null              $translationDomain The translation domain
-     *                                                    to use for translating
-     *                                                    violation messages
+     * @param string|null $translationDomain The translation domain
+     *                                       to use for translating
+     *                                       violation messages
      */
     public function __construct(MetadataFactoryInterface $metadataFactory, TranslatorInterface $translator, $translationDomain = null)
     {
diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
index c79f1259e7958..9fbcdc9afdea3 100644
--- a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
+++ b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
@@ -258,8 +258,7 @@ public function addConstraint(Constraint $constraint)
     /**
      * Adds a constraint to the given property.
      *
-     * @param string     $property   The name of the property
-     * @param Constraint $constraint The constraint
+     * @param string $property The name of the property
      *
      * @return $this
      */
@@ -299,8 +298,7 @@ public function addPropertyConstraints($property, array $constraints)
      * The name of the getter is assumed to be the name of the property with an
      * uppercased first letter and either the prefix "get" or "is".
      *
-     * @param string     $property   The name of the property
-     * @param Constraint $constraint The constraint
+     * @param string $property The name of the property
      *
      * @return $this
      */
@@ -322,9 +320,8 @@ public function addGetterConstraint($property, Constraint $constraint)
     /**
      * Adds a constraint to the getter of the given property.
      *
-     * @param string     $property   The name of the property
-     * @param string     $method     The name of the getter method
-     * @param Constraint $constraint The constraint
+     * @param string $property The name of the property
+     * @param string $method   The name of the getter method
      *
      * @return $this
      */
@@ -417,8 +414,6 @@ public function mergeConstraints(ClassMetadata $source)
     /**
      * Adds a member metadata.
      *
-     * @param MemberMetadata $metadata
-     *
      * @deprecated since version 2.6, to be removed in 3.0.
      */
     protected function addMemberMetadata(MemberMetadata $metadata)
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
index cfe8b8e7e473f..f600f562451ab 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
@@ -135,7 +135,6 @@ protected function createContext()
 
     /**
      * @param mixed  $message
-     * @param array  $parameters
      * @param string $propertyPath
      * @param string $invalidValue
      * @param null   $plural
@@ -245,14 +244,13 @@ protected function assertNoViolation()
 
     /**
      * @param mixed  $message
-     * @param array  $parameters
      * @param string $propertyPath
      * @param string $invalidValue
      * @param null   $plural
      * @param null   $code
      *
      * @deprecated To be removed in Symfony 3.0. Use
-     *             {@link buildViolation()} instead.
+     * {@link buildViolation()} instead.
      */
     protected function assertViolation($message, array $parameters = array(), $propertyPath = 'property.path', $invalidValue = 'InvalidValue', $plural = null, $code = null)
     {
@@ -268,10 +266,9 @@ protected function assertViolation($message, array $parameters = array(), $prope
     }
 
     /**
-     * @param array $expected
      *
      * @deprecated To be removed in Symfony 3.0. Use
-     *             {@link buildViolation()} instead.
+     * {@link buildViolation()} instead.
      */
     protected function assertViolations(array $expected)
     {
@@ -289,7 +286,6 @@ protected function assertViolations(array $expected)
     }
 
     /**
-     * @param $message
      *
      * @return ConstraintViolationAssertion
      */
diff --git a/src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php
index 47346324b88a3..07eeaa2b98d3d 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/AbstractLegacyApiTest.php
@@ -34,7 +34,6 @@ abstract class AbstractLegacyApiTest extends AbstractValidatorTest
     protected $validator;
 
     /**
-     * @param MetadataFactoryInterface $metadataFactory
      *
      * @return LegacyValidatorInterface
      */
diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
index 12a38e26ec19d..a9f6a35a7336b 100644
--- a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
+++ b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -48,7 +48,6 @@ class RecursiveContextualValidator implements ContextualValidatorInterface
     /**
      * Creates a validator for the given context.
      *
-     * @param ExecutionContextInterface           $context            The execution context
      * @param MetadataFactoryInterface            $metadataFactory    The factory for
      *                                                                fetching the metadata
      *                                                                of validated objects
@@ -765,22 +764,20 @@ private function validateGenericNode($value, $object, $cacheKey, MetadataInterfa
      * If any of the constraints generates a violation, subsequent groups in the
      * group sequence are skipped.
      *
-     * @param mixed                     $value             The validated value
-     * @param object|null               $object            The current object
-     * @param string                    $cacheKey          The key for caching
-     *                                                     the validated value
-     * @param MetadataInterface         $metadata          The metadata of the
-     *                                                     value
-     * @param string                    $propertyPath      The property path leading
-     *                                                     to the value
-     * @param int                       $traversalStrategy The strategy used for
-     *                                                     traversing the value
-     * @param GroupSequence             $groupSequence     The group sequence
-     * @param string|null               $cascadedGroup     The group that should
-     *                                                     be passed to cascaded
-     *                                                     objects instead of
-     *                                                     the group sequence
-     * @param ExecutionContextInterface $context           The execution context
+     * @param mixed             $value             The validated value
+     * @param object|null       $object            The current object
+     * @param string            $cacheKey          The key for caching
+     *                                             the validated value
+     * @param MetadataInterface $metadata          The metadata of the
+     *                                             value
+     * @param string            $propertyPath      The property path leading
+     *                                             to the value
+     * @param int               $traversalStrategy The strategy used for
+     *                                             traversing the value
+     * @param string|null       $cascadedGroup     The group that should
+     *                                             be passed to cascaded
+     *                                             objects instead of
+     *                                             the group sequence
      */
     private function stepThroughGroupSequence($value, $object, $cacheKey, MetadataInterface $metadata = null, $propertyPath, $traversalStrategy, GroupSequence $groupSequence, $cascadedGroup, ExecutionContextInterface $context)
     {
@@ -825,12 +822,11 @@ private function stepThroughGroupSequence($value, $object, $cacheKey, MetadataIn
     /**
      * Validates a node's value against all constraints in the given group.
      *
-     * @param mixed                     $value    The validated value
-     * @param string                    $cacheKey The key for caching the
-     *                                            validated value
-     * @param MetadataInterface         $metadata The metadata of the value
-     * @param string                    $group    The group to validate
-     * @param ExecutionContextInterface $context  The execution context
+     * @param mixed             $value    The validated value
+     * @param string            $cacheKey The key for caching the
+     *                                    validated value
+     * @param MetadataInterface $metadata The metadata of the value
+     * @param string            $group    The group to validate
      */
     private function validateInGroup($value, $cacheKey, MetadataInterface $metadata, $group, ExecutionContextInterface $context)
     {
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 97ce0cac0f770..1b74a0404d6bd 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -1079,8 +1079,6 @@ public function testAdditionallyIndentedLinesAreParsedAsNewLinesInFoldedBlocks()
     }
 
     /**
-     * @param $lineNumber
-     * @param $yaml
      * @dataProvider parserThrowsExceptionWithCorrectLineNumberProvider
      */
     public function testParserThrowsExceptionWithCorrectLineNumber($lineNumber, $yaml)