diff --git a/.php_cs.dist b/.php_cs.dist
index e288ca8bc484..6206f7144adc 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -14,6 +14,8 @@ return PhpCsFixer\Config::create()
         'array_syntax' => ['syntax' => 'short'],
         'fopen_flags' => false,
         'ordered_imports' => true,
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
+        'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
         'protected_to_private' => false,
         // Part of @Symfony:risky in PHP-CS-Fixer 2.13.0. To be removed from the config file once upgrading
         'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced', 'strict' => true],
@@ -25,16 +27,11 @@ return PhpCsFixer\Config::create()
         PhpCsFixer\Finder::create()
             ->in(__DIR__.'/src')
             ->append([__FILE__])
+            ->notPath('#/Fixtures/#')
             ->exclude([
                 // directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
-                'Symfony/Component/DependencyInjection/Tests/Fixtures',
-                'Symfony/Component/Routing/Tests/Fixtures/dumper',
                 // fixture templates
-                'Symfony/Component/Templating/Tests/Fixtures/templates',
-                'Symfony/Bundle/FrameworkBundle/Tests/Fixtures/TemplatePathsCache',
                 'Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom',
-                // generated fixtures
-                'Symfony/Component/VarDumper/Tests/Fixtures',
                 // resource templates
                 'Symfony/Bundle/FrameworkBundle/Resources/views/Form',
                 // explicit trigger_error tests
@@ -42,12 +39,12 @@ return PhpCsFixer\Config::create()
             ])
             // Support for older PHPunit version
             ->notPath('Symfony/Bridge/PhpUnit/SymfonyTestsListener.php')
+            ->notPath('#Symfony/Bridge/PhpUnit/.*Mock\.php#')
+            ->notPath('#Symfony/Bridge/PhpUnit/.*Legacy#')
             // file content autogenerated by `var_export`
             ->notPath('Symfony/Component/Translation/Tests/fixtures/resources.php')
             // test template
             ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
-            // explicit heredoc test
-            ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
             // explicit trigger_error tests
             ->notPath('Symfony/Component/Debug/Tests/DebugClassLoaderTest.php')
     )
diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
index 152c07bf60a9..937b36f5163c 100644
--- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
+++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -45,8 +45,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 10436e44eb31..ad5829647522 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -117,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
@@ -225,7 +224,6 @@ protected function registerMappingDrivers($objectManager, ContainerBuilder $cont
     /**
      * Assertion if the specified mapping information is valid.
      *
-     * @param array  $mappingConfig
      * @param string $objectManagerName
      *
      * @throws \InvalidArgumentException
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
index 89c6f7807a4e..98c2a9debd39 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
@@ -44,9 +44,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 3b7714f44d9a..d6b9d0a9a238 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -123,8 +123,7 @@ private function getEventManagerDef(ContainerBuilder $container, $name)
      * @see https://bugs.php.net/53710
      * @see https://bugs.php.net/60926
      *
-     * @param string           $tagName
-     * @param ContainerBuilder $container
+     * @param string $tagName
      *
      * @return array
      */
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
index 95ce28cb652f..0e726852f2be 100644
--- a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
+++ b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -264,9 +264,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 049ef4439298..2226da951248 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/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
index 3bab2d1a3ee0..1cadbeeda8ae 100644
--- a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
+++ b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -167,8 +167,6 @@ public function getTypes($class, $property, array $context = [])
     /**
      * Determines whether an association is nullable.
      *
-     * @param array $associationMapping
-     *
      * @return bool
      *
      * @see https://github.com/doctrine/doctrine2/blob/v2.5.4/lib/Doctrine/ORM/Tools/EntityGenerator.php#L1221-L1246
diff --git a/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php b/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
index 24da0b8deec0..2a07dbc2b3e6 100644
--- a/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
+++ b/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
@@ -28,8 +28,6 @@ class DoctrineTestHelper
     /**
      * Returns an entity manager for testing.
      *
-     * @param Configuration|null $config
-     *
      * @return EntityManager
      */
     public static function createTestEntityManager(Configuration $config = null)
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
index 01e493066ab3..8899e9fd6bf3 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -186,7 +186,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 cf0ed8c96210..312b84a71abc 100644
--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -34,8 +34,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 e3e40fdbcfbc..98b24278cff6 100644
--- a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
+++ b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -41,8 +41,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/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
index 2585b4823db5..7952c475926e 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/Bridge/Twig/TokenParser/TransChoiceTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php
index 178dc1604ae1..b1c8a39b3a7e 100644
--- a/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php
+++ b/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php
@@ -15,7 +15,6 @@
 use Twig\Error\SyntaxError;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Expression\ArrayExpression;
-use Twig\Node\Node;
 use Twig\Node\TextNode;
 use Twig\Token;
 
diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php
index 45896f7b4a53..72fbda77b8e4 100644
--- a/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php
+++ b/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bridge\Twig\TokenParser;
 
 use Symfony\Bridge\Twig\Node\TransDefaultDomainNode;
-use Twig\Node\Node;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
 
diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php
index 819f63f79ac6..5f1e19acb9bd 100644
--- a/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php
+++ b/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php
@@ -15,7 +15,6 @@
 use Twig\Error\SyntaxError;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Expression\ArrayExpression;
-use Twig\Node\Node;
 use Twig\Node\TextNode;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
index c7e641788b9a..9e0984dfb5b5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
@@ -95,8 +95,7 @@ final protected function ignoreAutoloadException($class, \Exception $exception)
     }
 
     /**
-     * @param string       $cacheDir
-     * @param ArrayAdapter $arrayAdapter
+     * @param string $cacheDir
      *
      * @return bool false if there is nothing to warm-up
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
index ad4687620da3..3859e07f4d12 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
@@ -31,10 +31,9 @@ class AnnotationsCacheWarmer extends AbstractPhpFileCacheWarmer
     private $debug;
 
     /**
-     * @param Reader                 $annotationReader
-     * @param string                 $phpArrayFile     The PHP file where annotations are cached
-     * @param CacheItemPoolInterface $fallbackPool     The pool where runtime-discovered annotations are cached
-     * @param bool                   $debug            Run in debug mode
+     * @param string                 $phpArrayFile The PHP file where annotations are cached
+     * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered annotations are cached
+     * @param bool                   $debug        Run in debug mode
      */
     public function __construct(Reader $annotationReader, $phpArrayFile, CacheItemPoolInterface $fallbackPool, $excludeRegexp = null, $debug = false)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
index 623a2907f64e..93c9eda6f13c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -33,9 +33,8 @@ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
     private $validatorBuilder;
 
     /**
-     * @param ValidatorBuilderInterface $validatorBuilder
-     * @param string                    $phpArrayFile     The PHP file where metadata are cached
-     * @param CacheItemPoolInterface    $fallbackPool     The pool where runtime-discovered metadata are cached
+     * @param string                 $phpArrayFile The PHP file where metadata are cached
+     * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered metadata are cached
      */
     public function __construct(ValidatorBuilderInterface $validatorBuilder, $phpArrayFile, CacheItemPoolInterface $fallbackPool)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
index 14f0dc28cfe5..969ac030bbe9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -42,7 +42,6 @@ class CacheClearCommand extends ContainerAwareCommand
 
     /**
      * @param CacheClearerInterface $cacheClearer
-     * @param Filesystem|null       $filesystem
      */
     public function __construct($cacheClearer = null, Filesystem $filesystem = null)
     {
@@ -267,10 +266,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/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
index c7b669fda022..91648f08bc7c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -127,8 +127,6 @@ abstract protected function describeContainerTags(ContainerBuilder $builder, arr
      * * name: name of described service
      *
      * @param Definition|Alias|object $service
-     * @param array                   $options
-     * @param ContainerBuilder|null   $builder
      */
     abstract protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null);
 
@@ -167,7 +165,6 @@ abstract protected function describeEventDispatcherListeners(EventDispatcherInte
      * Describes a callable.
      *
      * @param callable $callable
-     * @param array    $options
      */
     abstract protected function describeCallable($callable, array $options = []);
 
@@ -214,8 +211,7 @@ protected function formatParameter($value)
     }
 
     /**
-     * @param ContainerBuilder $builder
-     * @param string           $serviceId
+     * @param string $serviceId
      *
      * @return mixed
      */
@@ -235,8 +231,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 1b70e6d6d64e..b87e468c4ab3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -207,8 +207,7 @@ protected function getRouteData(Route $route)
     }
 
     /**
-     * @param Definition $definition
-     * @param bool       $omitTags
+     * @param bool $omitTags
      *
      * @return array
      */
@@ -285,8 +284,7 @@ private function getContainerAliasData(Alias $alias)
     }
 
     /**
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param string|null              $event
+     * @param string|null $event
      *
      * @return array
      */
@@ -318,7 +316,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 911e60c08be5..90b9c39def03 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -434,8 +434,6 @@ private function renderEventListenerTable(EventDispatcherInterface $eventDispatc
     }
 
     /**
-     * @param array $config
-     *
      * @return string
      */
     private function formatRouterConfig(array $config)
@@ -494,7 +492,6 @@ private function formatCallable($callable)
 
     /**
      * @param string $content
-     * @param array  $options
      */
     private function writeText($content, array $options = [])
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
index 638edbfade4f..f3b15c8c38e6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -156,7 +156,6 @@ private function getRouteCollectionDocument(RouteCollection $routes)
     }
 
     /**
-     * @param Route       $route
      * @param string|null $name
      *
      * @return \DOMDocument
@@ -242,8 +241,7 @@ private function getContainerParametersDocument(ParameterBag $parameters)
     }
 
     /**
-     * @param ContainerBuilder $builder
-     * @param bool             $showPrivate
+     * @param bool $showPrivate
      *
      * @return \DOMDocument
      */
@@ -266,10 +264,9 @@ private function getContainerTagsDocument(ContainerBuilder $builder, $showPrivat
     }
 
     /**
-     * @param mixed                 $service
-     * @param string                $id
-     * @param ContainerBuilder|null $builder
-     * @param bool                  $showArguments
+     * @param mixed  $service
+     * @param string $id
+     * @param bool   $showArguments
      *
      * @return \DOMDocument
      */
@@ -294,11 +291,10 @@ private function getContainerServiceDocument($service, $id, ContainerBuilder $bu
     }
 
     /**
-     * @param ContainerBuilder $builder
-     * @param string|null      $tag
-     * @param bool             $showPrivate
-     * @param bool             $showArguments
-     * @param callable         $filter
+     * @param string|null $tag
+     * @param bool        $showPrivate
+     * @param bool        $showArguments
+     * @param callable    $filter
      *
      * @return \DOMDocument
      */
@@ -328,7 +324,6 @@ private function getContainerServicesDocument(ContainerBuilder $builder, $tag =
     }
 
     /**
-     * @param Definition  $definition
      * @param string|null $id
      * @param bool        $omitTags
      *
@@ -452,7 +447,6 @@ private function getArgumentNodes(array $arguments, \DOMDocument $dom)
     }
 
     /**
-     * @param Alias       $alias
      * @param string|null $id
      *
      * @return \DOMDocument
@@ -490,8 +484,7 @@ private function getContainerParameterDocument($parameter, $options = [])
     }
 
     /**
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param string|null              $event
+     * @param string|null $event
      *
      * @return \DOMDocument
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
index a8f3ce954030..3779792d6d07 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -29,8 +29,6 @@ trait MicroKernelTrait
      *
      *     $routes->import('config/routing.yml');
      *     $routes->add('/admin', 'AppBundle:Admin:dashboard', 'admin_dashboard');
-     *
-     * @param RouteCollectionBuilder $routes
      */
     abstract protected function configureRoutes(RouteCollectionBuilder $routes);
 
@@ -50,9 +48,6 @@ abstract protected function configureRoutes(RouteCollectionBuilder $routes);
      * Or parameters:
      *
      *     $c->setParameter('halloween', 'lot of fun');
-     *
-     * @param ContainerBuilder $c
-     * @param LoaderInterface  $loader
      */
     abstract protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader);
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
index 00bb451e0ef0..3f7a51598352 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/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php
index 028e885246f6..027fe6586896 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php
@@ -24,11 +24,10 @@ interface SecurityFactoryInterface
     /**
      * Configures the container services required to use the authentication listener.
      *
-     * @param ContainerBuilder $container
-     * @param string           $id                The unique id of the firewall
-     * @param array            $config            The options array for the listener
-     * @param string           $userProvider      The service id of the user provider
-     * @param string           $defaultEntryPoint
+     * @param string $id                The unique id of the firewall
+     * @param array  $config            The options array for the listener
+     * @param string $userProvider      The service id of the user provider
+     * @param string $defaultEntryPoint
      *
      * @return array containing three values:
      *               - the provider id
diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
index 874bed33e9ff..23abdbf992aa 100644
--- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
+++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
@@ -32,7 +32,6 @@ class TemplateCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInte
      * TemplateCacheWarmer constructor.
      *
      * @param ContainerInterface $container
-     * @param \Traversable       $iterator
      */
     public function __construct($container, \Traversable $iterator)
     {
diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
index ff47c3d2bab4..da7f70a14def 100644
--- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
+++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
@@ -32,8 +32,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)
     {
@@ -88,10 +87,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 string
      */
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
index bd4c945b1da1..7f2a2406a988 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/Profiler/TemplateManager.php b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
index 630de0c8b1af..5156152aa94b 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/Context/RequestStackContext.php b/src/Symfony/Component/Asset/Context/RequestStackContext.php
index c18f83326483..053d263a464e 100644
--- a/src/Symfony/Component/Asset/Context/RequestStackContext.php
+++ b/src/Symfony/Component/Asset/Context/RequestStackContext.php
@@ -25,9 +25,8 @@ class RequestStackContext implements ContextInterface
     private $secure;
 
     /**
-     * @param RequestStack $requestStack
-     * @param string       $basePath
-     * @param bool         $secure
+     * @param string $basePath
+     * @param bool   $secure
      */
     public function __construct(RequestStack $requestStack, $basePath = '', $secure = false)
     {
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
index b543371159df..6ff802c3084b 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -86,11 +86,10 @@ static function ($deferred, $namespace, &$expiredIds) use ($getId) {
     }
 
     /**
-     * @param string               $namespace
-     * @param int                  $defaultLifetime
-     * @param string               $version
-     * @param string               $directory
-     * @param LoggerInterface|null $logger
+     * @param string $namespace
+     * @param int    $defaultLifetime
+     * @param string $version
+     * @param string $directory
      *
      * @return AdapterInterface
      */
diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineAdapter.php
index 972d2b41545e..8081d7dc32a5 100644
--- a/src/Symfony/Component/Cache/Adapter/DoctrineAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/DoctrineAdapter.php
@@ -19,9 +19,8 @@ class DoctrineAdapter extends AbstractAdapter
     use DoctrineTrait;
 
     /**
-     * @param CacheProvider $provider
-     * @param string        $namespace
-     * @param int           $defaultLifetime
+     * @param string $namespace
+     * @param int    $defaultLifetime
      */
     public function __construct(CacheProvider $provider, $namespace = '', $defaultLifetime = 0)
     {
diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
index 009e92fb88e0..f5748268440a 100644
--- a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
@@ -31,9 +31,8 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
     private $poolHash;
 
     /**
-     * @param CacheItemPoolInterface $pool
-     * @param string                 $namespace
-     * @param int                    $defaultLifetime
+     * @param string $namespace
+     * @param int    $defaultLifetime
      */
     public function __construct(CacheItemPoolInterface $pool, $namespace = '', $defaultLifetime = 0)
     {
diff --git a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
index a2f826d70562..c9e87d5cce16 100644
--- a/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
+++ b/src/Symfony/Component/Cache/DataCollector/CacheDataCollector.php
@@ -30,8 +30,7 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
     private $instances = [];
 
     /**
-     * @param string           $name
-     * @param TraceableAdapter $instance
+     * @param string $name
      */
     public function addInstance($name, TraceableAdapter $instance)
     {
diff --git a/src/Symfony/Component/Cache/Simple/DoctrineCache.php b/src/Symfony/Component/Cache/Simple/DoctrineCache.php
index 00f0b9c6fc32..ea1a4eda50ba 100644
--- a/src/Symfony/Component/Cache/Simple/DoctrineCache.php
+++ b/src/Symfony/Component/Cache/Simple/DoctrineCache.php
@@ -19,9 +19,8 @@ class DoctrineCache extends AbstractCache
     use DoctrineTrait;
 
     /**
-     * @param CacheProvider $provider
-     * @param string        $namespace
-     * @param int           $defaultLifetime
+     * @param string $namespace
+     * @param int    $defaultLifetime
      */
     public function __construct(CacheProvider $provider, $namespace = '', $defaultLifetime = 0)
     {
diff --git a/src/Symfony/Component/Cache/Simple/MemcachedCache.php b/src/Symfony/Component/Cache/Simple/MemcachedCache.php
index 7717740622c5..94a9f297d7a1 100644
--- a/src/Symfony/Component/Cache/Simple/MemcachedCache.php
+++ b/src/Symfony/Component/Cache/Simple/MemcachedCache.php
@@ -20,9 +20,8 @@ class MemcachedCache extends AbstractCache
     protected $maxIdLength = 250;
 
     /**
-     * @param \Memcached $client
-     * @param string     $namespace
-     * @param int        $defaultLifetime
+     * @param string $namespace
+     * @param int    $defaultLifetime
      */
     public function __construct(\Memcached $client, $namespace = '', $defaultLifetime = 0)
     {
diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
index da05530acfdd..62003692c6f3 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 7aa97909f3e2..5b216d897a36 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -70,10 +70,8 @@ public function dumpNode(NodeInterface $node)
     }
 
     /**
-     * @param NodeInterface      $node
-     * @param NodeInterface|null $parentNode
-     * @param int                $depth
-     * @param bool               $prototypedArray
+     * @param int  $depth
+     * @param bool $prototypedArray
      */
     private function writeNode(NodeInterface $node, NodeInterface $parentNode = null, $depth = 0, $prototypedArray = false)
     {
@@ -215,8 +213,6 @@ private function writeArray(array $array, $depth)
     }
 
     /**
-     * @param PrototypedArrayNode $node
-     *
      * @return array
      */
     private function getPrototypeChildren(PrototypedArrayNode $node)
diff --git a/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
index 6478bd12db99..7a58ead8da96 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/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
index 79a358fb32ee..442a569711c0 100644
--- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
+++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
@@ -44,7 +44,6 @@ class ApplicationDescription
     private $aliases;
 
     /**
-     * @param Application $application
      * @param string|null $namespace
      * @param bool        $showHidden
      */
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
index fbc07df879ab..e3184a6a5a20 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
@@ -23,9 +23,7 @@ interface DescriptorInterface
     /**
      * Describes an object if supported.
      *
-     * @param OutputInterface $output
-     * @param object          $object
-     * @param array           $options
+     * @param object $object
      */
     public function describe(OutputInterface $output, $object, array $options = []);
 }
diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
index ace3191a847a..2d2545864fcf 100644
--- a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
@@ -81,7 +81,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 f8a3847b49c6..3055baefd432 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -48,9 +48,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
      */
@@ -72,8 +70,7 @@ public function describe(OutputInterface $output, $object, array $options = [])
     /**
      * Registers a descriptor.
      *
-     * @param string              $format
-     * @param DescriptorInterface $descriptor
+     * @param string $format
      *
      * @return $this
      */
diff --git a/src/Symfony/Component/Console/Helper/ProgressIndicator.php b/src/Symfony/Component/Console/Helper/ProgressIndicator.php
index 3f5751fae639..60ca0213ba51 100644
--- a/src/Symfony/Component/Console/Helper/ProgressIndicator.php
+++ b/src/Symfony/Component/Console/Helper/ProgressIndicator.php
@@ -34,10 +34,9 @@ class ProgressIndicator
     private static $formats;
 
     /**
-     * @param OutputInterface $output
-     * @param string|null     $format                  Indicator format
-     * @param int             $indicatorChangeInterval Change interval in milliseconds
-     * @param array|null      $indicatorValues         Animated indicator characters
+     * @param string|null $format                  Indicator format
+     * @param int         $indicatorChangeInterval Change interval in milliseconds
+     * @param array|null  $indicatorValues         Animated indicator characters
      */
     public function __construct(OutputInterface $output, $format = null, $indicatorChangeInterval = 100, $indicatorValues = null)
     {
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index 2d910f435611..c046f5ec9faf 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -230,10 +230,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
      */
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
index 1c439dc1bfe9..0f3d673586ac 100644
--- a/src/Symfony/Component/Console/Helper/Table.php
+++ b/src/Symfony/Component/Console/Helper/Table.php
@@ -193,8 +193,6 @@ public function setColumnWidth($columnIndex, $width)
     /**
      * Sets the minimum width of all columns.
      *
-     * @param array $widths
-     *
      * @return $this
      */
     public function setColumnWidths(array $widths)
@@ -341,7 +339,6 @@ private function renderColumnSeparator()
      *
      *     | 9971-5-0210-0 | A Tale of Two Cities  | Charles Dickens  |
      *
-     * @param array  $row
      * @param string $cellFormat
      */
     private function renderRow(array $row, $cellFormat)
@@ -361,7 +358,6 @@ private function renderRow(array $row, $cellFormat)
     /**
      * Renders table cell with padding.
      *
-     * @param array  $row
      * @param int    $column
      * @param string $cellFormat
      */
@@ -453,8 +449,7 @@ private function buildTableRows($rows)
     /**
      * fill rows that contains rowspan > 1.
      *
-     * @param array $rows
-     * @param int   $line
+     * @param int $line
      *
      * @return array
      *
@@ -533,8 +528,7 @@ private function fillCells($row)
     }
 
     /**
-     * @param array $rows
-     * @param int   $line
+     * @param int $line
      *
      * @return array
      */
@@ -629,8 +623,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 cc5145329c18..78e5d6975517 100644
--- a/src/Symfony/Component/Console/Helper/TableCell.php
+++ b/src/Symfony/Component/Console/Helper/TableCell.php
@@ -26,7 +26,6 @@ class TableCell
 
     /**
      * @param string $value
-     * @param array  $options
      */
     public function __construct($value = '', array $options = [])
     {
diff --git a/src/Symfony/Component/Console/Logger/ConsoleLogger.php b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
index b4821e0955aa..6b1745e458c2 100644
--- a/src/Symfony/Component/Console/Logger/ConsoleLogger.php
+++ b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
@@ -101,7 +101,6 @@ public function hasErrored()
      * @author PHP Framework Interoperability Group
      *
      * @param string $message
-     * @param array  $context
      *
      * @return string
      */
diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
index 92b9b6936291..e340fe9d87fa 100644
--- a/src/Symfony/Component/Console/Question/Question.php
+++ b/src/Symfony/Component/Console/Question/Question.php
@@ -156,8 +156,6 @@ public function setAutocompleterValues($values)
     /**
      * Sets a validator for the question.
      *
-     * @param callable|null $validator
-     *
      * @return $this
      */
     public function setValidator(callable $validator = null)
@@ -216,8 +214,6 @@ public function getMaxAttempts()
      *
      * The normalizer can be a callable (a string), a closure or a class implementing __invoke.
      *
-     * @param callable $normalizer
-     *
      * @return $this
      */
     public function setNormalizer(callable $normalizer)
diff --git a/src/Symfony/Component/Console/Style/StyleInterface.php b/src/Symfony/Component/Console/Style/StyleInterface.php
index 475c268ffe40..3b5b8af51610 100644
--- a/src/Symfony/Component/Console/Style/StyleInterface.php
+++ b/src/Symfony/Component/Console/Style/StyleInterface.php
@@ -119,7 +119,6 @@ public function confirm($question, $default = true);
      * Asks a choice question.
      *
      * @param string          $question
-     * @param array           $choices
      * @param string|int|null $default
      *
      * @return mixed
diff --git a/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php b/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
index cb3158a5536d..1200c979ea6a 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 1caccb6bfeef..c09d92477e2a 100644
--- a/src/Symfony/Component/CssSelector/Node/AttributeNode.php
+++ b/src/Symfony/Component/CssSelector/Node/AttributeNode.php
@@ -30,11 +30,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 69462e8e7109..866607cba61d 100644
--- a/src/Symfony/Component/CssSelector/Node/ClassNode.php
+++ b/src/Symfony/Component/CssSelector/Node/ClassNode.php
@@ -27,8 +27,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 2aa583aaf692..27b0224857e3 100644
--- a/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
+++ b/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
@@ -28,9 +28,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 677affaa98d7..b6f95e975d77 100644
--- a/src/Symfony/Component/CssSelector/Node/FunctionNode.php
+++ b/src/Symfony/Component/CssSelector/Node/FunctionNode.php
@@ -30,9 +30,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 = [])
     {
diff --git a/src/Symfony/Component/CssSelector/Node/HashNode.php b/src/Symfony/Component/CssSelector/Node/HashNode.php
index ebf9a9872a7d..3ea89dc18389 100644
--- a/src/Symfony/Component/CssSelector/Node/HashNode.php
+++ b/src/Symfony/Component/CssSelector/Node/HashNode.php
@@ -27,8 +27,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 3842c695e852..c7d0b9fb3c17 100644
--- a/src/Symfony/Component/CssSelector/Node/PseudoNode.php
+++ b/src/Symfony/Component/CssSelector/Node/PseudoNode.php
@@ -27,8 +27,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 057107f6f5b5..2379babffd84 100644
--- a/src/Symfony/Component/CssSelector/Node/SelectorNode.php
+++ b/src/Symfony/Component/CssSelector/Node/SelectorNode.php
@@ -27,8 +27,7 @@ class SelectorNode extends AbstractNode
     private $pseudoElement;
 
     /**
-     * @param NodeInterface $tree
-     * @param string|null   $pseudoElement
+     * @param string|null $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 f07985ac52ab..7b131efdbaf2 100644
--- a/src/Symfony/Component/CssSelector/Parser/Parser.php
+++ b/src/Symfony/Component/CssSelector/Parser/Parser.php
@@ -158,8 +158,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 0571b3b7651e..f27878b1454a 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php
@@ -44,9 +44,8 @@ public function getAttributeMatchingTranslators()
     }
 
     /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
+     * @param string $attribute
+     * @param string $value
      *
      * @return XPathExpr
      */
@@ -56,9 +55,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
      */
@@ -68,9 +66,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
      */
@@ -84,9 +81,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
      */
@@ -101,9 +97,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
      */
@@ -117,9 +112,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
      */
@@ -134,9 +128,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
      */
@@ -150,9 +143,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 a8e0b69f1276..2b8aa6a192a7 100644
--- a/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
+++ b/src/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php
@@ -46,10 +46,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 d078126772e9..7388860310f0 100644
--- a/src/Symfony/Component/CssSelector/XPath/Translator.php
+++ b/src/Symfony/Component/CssSelector/XPath/Translator.php
@@ -180,9 +180,7 @@ public function nodeToXPath(NodeInterface $node)
     }
 
     /**
-     * @param string        $combiner
-     * @param NodeInterface $xpath
-     * @param NodeInterface $combinedXpath
+     * @param string $combiner
      *
      * @return XPathExpr
      *
@@ -212,8 +210,7 @@ public function addFunction(XPathExpr $xpath, FunctionNode $function)
     }
 
     /**
-     * @param XPathExpr $xpath
-     * @param string    $pseudoClass
+     * @param string $pseudoClass
      *
      * @return XPathExpr
      *
@@ -229,10 +226,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/TranslatorInterface.php b/src/Symfony/Component/CssSelector/XPath/TranslatorInterface.php
index 0b5de83d5712..fdbdf22555d9 100644
--- a/src/Symfony/Component/CssSelector/XPath/TranslatorInterface.php
+++ b/src/Symfony/Component/CssSelector/XPath/TranslatorInterface.php
@@ -38,8 +38,7 @@ public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::');
     /**
      * Translates a parsed selector node to an XPath expression.
      *
-     * @param SelectorNode $selector
-     * @param string       $prefix
+     * @param string $prefix
      *
      * @return string
      */
diff --git a/src/Symfony/Component/DependencyInjection/Argument/RewindableGenerator.php b/src/Symfony/Component/DependencyInjection/Argument/RewindableGenerator.php
index f8f771d627ac..b00a36c34f54 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/RewindableGenerator.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/RewindableGenerator.php
@@ -20,7 +20,6 @@ class RewindableGenerator implements \IteratorAggregate, \Countable
     private $count;
 
     /**
-     * @param callable     $generator
      * @param int|callable $count
      */
     public function __construct(callable $generator, $count)
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
index cff09d57d4ad..a89bf1647aeb 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
@@ -81,8 +81,7 @@ protected function processValue($value, $isRoot = false)
     }
 
     /**
-     * @param Definition $definition
-     * @param bool       $required
+     * @param bool $required
      *
      * @return \ReflectionFunctionAbstract|null
      *
@@ -137,8 +136,7 @@ protected function getConstructor(Definition $definition, $required)
     }
 
     /**
-     * @param Definition $definition
-     * @param string     $method
+     * @param string $method
      *
      * @throws RuntimeException
      *
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index f2a5b46993a0..91b279c77a25 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -79,8 +79,6 @@ public function process(ContainerBuilder $container)
     /**
      * Creates a resource to help know if this service has changed.
      *
-     * @param \ReflectionClass $reflectionClass
-     *
      * @return AutowireServiceResource
      *
      * @deprecated since version 3.3, to be removed in 4.0. Use ContainerBuilder::getReflectionClass() instead.
@@ -168,9 +166,6 @@ private function doProcessValue($value, $isRoot = false)
     }
 
     /**
-     * @param \ReflectionClass $reflectionClass
-     * @param array            $methodCalls
-     *
      * @return array
      */
     private function autowireCalls(\ReflectionClass $reflectionClass, array $methodCalls)
@@ -205,9 +200,6 @@ private function autowireCalls(\ReflectionClass $reflectionClass, array $methodC
     /**
      * Autowires the constructor or a method.
      *
-     * @param \ReflectionFunctionAbstract $reflectionMethod
-     * @param array                       $arguments
-     *
      * @return array The autowired arguments
      *
      * @throws AutowiringFailedException
@@ -350,8 +342,7 @@ private function populateAvailableTypes($onlyAutowiringTypes = false)
     /**
      * Populates the list of available types for a given definition.
      *
-     * @param string     $id
-     * @param Definition $definition
+     * @param string $id
      */
     private function populateAvailableType($id, Definition $definition, $onlyAutowiringTypes)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
index a6ae94d8cacc..bf0d9c3eab05 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
@@ -73,9 +73,8 @@ public function getLoggingFormatter()
     /**
      * Adds a pass to the PassConfig.
      *
-     * @param CompilerPassInterface $pass     A compiler pass
-     * @param string                $type     The type of the pass
-     * @param int                   $priority Used to sort the passes
+     * @param CompilerPassInterface $pass A compiler pass
+     * @param string                $type The type of the pass
      */
     public function addPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/*, int $priority = 0*/)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index 77f4e953157c..323faad57f9a 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -113,9 +113,8 @@ public function getPasses()
     /**
      * Adds a pass.
      *
-     * @param CompilerPassInterface $pass     A Compiler pass
-     * @param string                $type     The pass type
-     * @param int                   $priority Used to sort the passes
+     * @param CompilerPassInterface $pass A Compiler pass
+     * @param string                $type The pass type
      *
      * @throws InvalidArgumentException when a pass type doesn't exist
      */
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
index 5b7475b394d2..c7e12536eade 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
@@ -31,8 +31,7 @@ trait PriorityTaggedServiceTrait
      * @see https://bugs.php.net/53710
      * @see https://bugs.php.net/60926
      *
-     * @param string           $tagName
-     * @param ContainerBuilder $container
+     * @param string $tagName
      *
      * @return Reference[]
      */
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
index b80e45256cbe..2559dcf10c00 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
@@ -56,8 +56,7 @@ protected function processValue($value, $isRoot = false)
     /**
      * Resolves an alias into a definition id.
      *
-     * @param string           $id        The definition or alias id to resolve
-     * @param ContainerBuilder $container
+     * @param string $id The definition or alias id to resolve
      *
      * @return string The definition id with aliases resolved
      */
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
index 51de4d7ac097..0d77d7e4839d 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
@@ -76,9 +76,8 @@ protected function processValue($value, $isRoot = false)
     }
 
     /**
-     * @param ContainerBuilder $container
-     * @param Reference[]      $refMap
-     * @param string|null      $callerId
+     * @param Reference[] $refMap
+     * @param string|null $callerId
      *
      * @return Reference
      */
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
index 23d4745ed3d9..e419e297e8f1 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
@@ -89,9 +89,6 @@ public function clear()
      * @param string $destId
      * @param mixed  $destValue
      * @param string $reference
-     * @param bool   $lazy
-     * @param bool   $weak
-     * @param bool   $byConstructor
      */
     public function connect($sourceId, $sourceValue, $destId, $destValue = null, $reference = null/*, bool $lazy = false, bool $weak = false, bool $byConstructor = false*/)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php
index 5b8c84b6d61f..911e7a5f5fac 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php
@@ -28,12 +28,10 @@ class ServiceReferenceGraphEdge
     private $byConstructor;
 
     /**
-     * @param ServiceReferenceGraphNode $sourceNode
-     * @param ServiceReferenceGraphNode $destNode
-     * @param mixed                     $value
-     * @param bool                      $lazy
-     * @param bool                      $weak
-     * @param bool                      $byConstructor
+     * @param mixed $value
+     * @param bool  $lazy
+     * @param bool  $weak
+     * @param bool  $byConstructor
      */
     public function __construct(ServiceReferenceGraphNode $sourceNode, ServiceReferenceGraphNode $destNode, $value = null, $lazy = false, $weak = false, $byConstructor = false)
     {
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index a30d984e1f53..4797047bbc3e 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1650,7 +1650,6 @@ private function callMethod($service, $call, array &$inlineServices)
     /**
      * Shares a given service in the container.
      *
-     * @param Definition  $definition
      * @param mixed       $service
      * @param string|null $id
      */
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index ee58034713b0..3f820c0c89c1 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -936,8 +936,6 @@ public function getBindings()
      * injected in the matching parameters (of the constructor, of methods
      * called and of controller actions).
      *
-     * @param array $bindings
-     *
      * @return $this
      */
     public function setBindings(array $bindings)
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 3e586ff71e83..b6d0b03b2b24 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -470,9 +470,8 @@ private function addServiceInclude($cId, Definition $definition)
     /**
      * Generates the service instance.
      *
-     * @param string     $id
-     * @param Definition $definition
-     * @param bool       $isSimpleInstance
+     * @param string $id
+     * @param bool   $isSimpleInstance
      *
      * @return string
      *
@@ -509,8 +508,6 @@ private function addServiceInstance($id, Definition $definition, $isSimpleInstan
     /**
      * Checks if the definition is a trivial instance.
      *
-     * @param Definition $definition
-     *
      * @return bool
      */
     private function isTrivialInstance(Definition $definition)
@@ -554,8 +551,7 @@ private function isTrivialInstance(Definition $definition)
     /**
      * Adds method calls to a service definition.
      *
-     * @param Definition $definition
-     * @param string     $variableName
+     * @param string $variableName
      *
      * @return string
      */
@@ -587,8 +583,7 @@ private function addServiceProperties(Definition $definition, $variableName = 'i
     /**
      * Adds configurator definition.
      *
-     * @param Definition $definition
-     * @param string     $variableName
+     * @param string $variableName
      *
      * @return string
      */
@@ -624,9 +619,8 @@ private function addServiceConfigurator(Definition $definition, $variableName =
     /**
      * Adds a service.
      *
-     * @param string     $id
-     * @param Definition $definition
-     * @param string     &$file
+     * @param string $id
+     * @param string &$file
      *
      * @return string
      */
@@ -1471,7 +1465,6 @@ protected function getDefaultParameters()
     /**
      * Exports parameters.
      *
-     * @param array  $parameters
      * @param string $path
      * @param int    $indent
      *
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
index 67b6dbebb438..cfc932843937 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -90,9 +90,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)
     {
@@ -221,9 +220,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)
     {
@@ -261,10 +258,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 8f3fcddf3079..be6bf5a72224 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -57,8 +57,7 @@ public function dump(array $options = [])
     /**
      * Adds a service.
      *
-     * @param string     $id
-     * @param Definition $definition
+     * @param string $id
      *
      * @return string
      */
@@ -171,7 +170,6 @@ private function addService($id, Definition $definition)
      * Adds a service alias.
      *
      * @param string $alias
-     * @param Alias  $id
      *
      * @return string
      */
@@ -337,8 +335,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/LazyProxy/PhpDumper/DumperInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php
index f2d0476f6e4a..3946eafafde0 100644
--- a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php
+++ b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php
@@ -30,9 +30,7 @@ public function isProxyCandidate(Definition $definition);
     /**
      * Generates the code to be used to instantiate a proxy in the dumped factory code.
      *
-     * @param Definition $definition
-     * @param string     $id          Service identifier
-     * @param string     $factoryCode The code to execute to create the service, will be added to the interface in 4.0
+     * @param string $id Service identifier
      *
      * @return string
      */
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
index f0d920189240..186c9c4cec7c 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -86,8 +86,7 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e
     /**
      * Registers a definition in the container with its instanceof-conditionals.
      *
-     * @param string     $id
-     * @param Definition $definition
+     * @param string $id
      */
     protected function setDefinition($id, Definition $definition)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 60102eaa8c29..799b60d98e28 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -86,8 +86,7 @@ public function supports($resource, $type = null)
     /**
      * Parses parameters.
      *
-     * @param \DOMDocument $xml
-     * @param string       $file
+     * @param string $file
      */
     private function parseParameters(\DOMDocument $xml, $file)
     {
@@ -99,8 +98,7 @@ private function parseParameters(\DOMDocument $xml, $file)
     /**
      * Parses imports.
      *
-     * @param \DOMDocument $xml
-     * @param string       $file
+     * @param string $file
      */
     private function parseImports(\DOMDocument $xml, $file)
     {
@@ -121,8 +119,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, $defaults)
     {
@@ -193,9 +190,7 @@ private function getServiceDefaults(\DOMDocument $xml, $file)
     /**
      * Parses an individual Definition.
      *
-     * @param \DOMElement $service
-     * @param string      $file
-     * @param array       $defaults
+     * @param string $file
      *
      * @return Definition|null
      */
@@ -394,9 +389,8 @@ private function parseFileToDOM($file)
     /**
      * Processes anonymous services.
      *
-     * @param \DOMDocument $xml
-     * @param string       $file
-     * @param array        $defaults
+     * @param string $file
+     * @param array  $defaults
      */
     private function processAnonymousServices(\DOMDocument $xml, $file, $defaults)
     {
@@ -456,10 +450,9 @@ private function processAnonymousServices(\DOMDocument $xml, $file, $defaults)
     /**
      * Returns arguments as valid php types.
      *
-     * @param \DOMElement $node
-     * @param string      $name
-     * @param string      $file
-     * @param bool        $lowercase
+     * @param string $name
+     * @param string $file
+     * @param bool   $lowercase
      *
      * @return mixed
      */
@@ -546,8 +539,7 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase =
     /**
      * Get child elements by name.
      *
-     * @param \DOMNode $node
-     * @param mixed    $name
+     * @param mixed $name
      *
      * @return \DOMElement[]
      */
@@ -566,8 +558,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
@@ -645,8 +635,7 @@ public function validateSchema(\DOMDocument $dom)
     /**
      * Validates an alias.
      *
-     * @param \DOMElement $alias
-     * @param string      $file
+     * @param string $file
      */
     private function validateAlias(\DOMElement $alias, $file)
     {
@@ -666,8 +655,7 @@ private function validateAlias(\DOMElement $alias, $file)
     /**
      * Validates an extension.
      *
-     * @param \DOMDocument $dom
-     * @param string       $file
+     * @param string $file
      *
      * @throws InvalidArgumentException When no extension is found corresponding to a tag
      */
@@ -688,8 +676,6 @@ private function validateExtensions(\DOMDocument $dom, $file)
 
     /**
      * Loads from an extension.
-     *
-     * @param \DOMDocument $xml
      */
     private function loadFromExtensions(\DOMDocument $xml)
     {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index a3a799024e49..891689bc1690 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -170,7 +170,6 @@ public function supports($resource, $type = null)
     /**
      * Parses all imports.
      *
-     * @param array  $content
      * @param string $file
      */
     private function parseImports(array $content, $file)
@@ -200,7 +199,6 @@ private function parseImports(array $content, $file)
     /**
      * Parses definitions.
      *
-     * @param array  $content
      * @param string $file
      */
     private function parseDefinitions(array $content, $file)
@@ -241,7 +239,6 @@ private function parseDefinitions(array $content, $file)
     }
 
     /**
-     * @param array  $content
      * @param string $file
      *
      * @return array
@@ -306,8 +303,6 @@ private function parseDefaults(array &$content, $file)
     }
 
     /**
-     * @param array $service
-     *
      * @return bool
      */
     private function isUsingShortSyntax(array $service)
@@ -327,7 +322,6 @@ private function isUsingShortSyntax(array $service)
      * @param string       $id
      * @param array|string $service
      * @param string       $file
-     * @param array        $defaults
      *
      * @throws InvalidArgumentException When tags are invalid
      */
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index d9ae3ed7a743..5609f464a216 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -899,7 +899,6 @@ public function registerNamespace($prefix, $namespace)
      *     echo Crawler::xpathLiteral('a\'b"c');
      *     //prints concat('a', "'", 'b"c')
      *
-     *
      * @param string $s String to be escaped
      *
      * @return string Converted string
@@ -1095,9 +1094,6 @@ protected function sibling($node, $siblingDir = 'nextSibling')
     }
 
     /**
-     * @param \DOMDocument $document
-     * @param array        $prefixes
-     *
      * @return \DOMXPath
      *
      * @throws \InvalidArgumentException
@@ -1117,8 +1113,7 @@ private function createDOMXPath(\DOMDocument $document, array $prefixes = [])
     }
 
     /**
-     * @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 9196628789b1..5ebf47464a04 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/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
index b43529abdfc3..c6fc3cbda9ea 100644
--- a/src/Symfony/Component/Dotenv/Dotenv.php
+++ b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -38,8 +38,7 @@ final class Dotenv
     /**
      * Loads one or several .env files.
      *
-     * @param string    $path  A file to load
-     * @param ...string $paths A list of additional files to load
+     * @param string $path A file to load
      *
      * @throws FormatException when a file has a syntax error
      * @throws PathException   when a file does not exist or is not readable
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
index 9aa0935ed5ec..ed41b2147d2e 100644
--- a/src/Symfony/Component/Form/ButtonBuilder.php
+++ b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -88,7 +88,6 @@ public function add($child, $type = null, array $options = [])
      *
      * @param string                   $name
      * @param string|FormTypeInterface $type
-     * @param array                    $options
      *
      * @throws BadMethodCallException
      */
@@ -190,8 +189,7 @@ public function addEventSubscriber(EventSubscriberInterface $subscriber)
      *
      * This method should not be invoked.
      *
-     * @param DataTransformerInterface $viewTransformer
-     * @param bool                     $forcePrepend
+     * @param bool $forcePrepend
      *
      * @throws BadMethodCallException
      */
@@ -217,8 +215,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/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
index 23bdbef38462..db6f82ff8a96 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|callable $deleteEmpty
diff --git a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
index 927c7157e5ff..04e24be71922 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
@@ -34,12 +34,11 @@ class FormTypeCsrfExtension extends AbstractTypeExtension
     private $serverParams;
 
     /**
-     * @param CsrfTokenManagerInterface $defaultTokenManager
-     * @param bool                      $defaultEnabled
-     * @param string                    $defaultFieldName
-     * @param TranslatorInterface       $translator
-     * @param string|null               $translationDomain
-     * @param ServerParams              $serverParams
+     * @param bool                $defaultEnabled
+     * @param string              $defaultFieldName
+     * @param TranslatorInterface $translator
+     * @param string|null         $translationDomain
+     * @param ServerParams        $serverParams
      */
     public function __construct(CsrfTokenManagerInterface $defaultTokenManager, $defaultEnabled = true, $defaultFieldName = '_token', TranslatorInterface $translator = null, $translationDomain = null, ServerParams $serverParams = null)
     {
diff --git a/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php b/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
index 6479c85939d9..507ee280af1e 100644
--- a/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
+++ b/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
@@ -29,9 +29,8 @@ class DependencyInjectionExtension implements FormExtensionInterface
     private $guesserServiceIds;
 
     /**
-     * @param ContainerInterface $typeContainer
-     * @param iterable[]         $typeExtensionServices
-     * @param iterable           $guesserServices
+     * @param iterable[] $typeExtensionServices
+     * @param iterable   $guesserServices
      */
     public function __construct(ContainerInterface $typeContainer, array $typeExtensionServices, $guesserServices, array $guesserServiceIds = null)
     {
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php
index cb9f3f953326..d300f5028647 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 658bad5a48f5..f07fc41271a8 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/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php
index f4388edd69ab..9e2aa95002bf 100644
--- a/src/Symfony/Component/Form/FormBuilder.php
+++ b/src/Symfony/Component/Form/FormBuilder.php
@@ -38,11 +38,8 @@ class FormBuilder extends FormConfigBuilder implements \IteratorAggregate, FormB
     private $unresolvedChildren = [];
 
     /**
-     * @param string                   $name
-     * @param string|null              $dataClass
-     * @param EventDispatcherInterface $dispatcher
-     * @param FormFactoryInterface     $factory
-     * @param array                    $options
+     * @param string      $name
+     * @param string|null $dataClass
      */
     public function __construct($name, $dataClass, EventDispatcherInterface $dispatcher, FormFactoryInterface $factory, array $options = [])
     {
diff --git a/src/Symfony/Component/Form/FormConfigBuilderInterface.php b/src/Symfony/Component/Form/FormConfigBuilderInterface.php
index d516e41056ec..59da9520ba10 100644
--- a/src/Symfony/Component/Form/FormConfigBuilderInterface.php
+++ b/src/Symfony/Component/Form/FormConfigBuilderInterface.php
@@ -47,8 +47,7 @@ public function addEventSubscriber(EventSubscriberInterface $subscriber);
      * The reverseTransform method of the transformer is used to convert from the
      * view to the normalized format.
      *
-     * @param DataTransformerInterface $viewTransformer
-     * @param bool                     $forcePrepend    If set to true, prepend instead of appending
+     * @param bool $forcePrepend If set to true, prepend instead of appending
      *
      * @return $this The configuration object
      */
@@ -69,8 +68,7 @@ public function resetViewTransformers();
      * The reverseTransform method of the transformer is used to convert from the
      * normalized to the model format.
      *
-     * @param DataTransformerInterface $modelTransformer
-     * @param bool                     $forceAppend      If set to true, append instead of prepending
+     * @param bool $forceAppend If set to true, append instead of prepending
      *
      * @return $this The configuration object
      */
diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
index 25dff2aa9794..5c55bcd7951d 100644
--- a/src/Symfony/Component/Form/FormInterface.php
+++ b/src/Symfony/Component/Form/FormInterface.php
@@ -208,8 +208,6 @@ public function getPropertyPath();
     /**
      * Adds an error to this form.
      *
-     * @param FormError $error
-     *
      * @return $this
      */
     public function addError(FormError $error);
diff --git a/src/Symfony/Component/Form/ResolvedFormTypeFactoryInterface.php b/src/Symfony/Component/Form/ResolvedFormTypeFactoryInterface.php
index 3240d77f4f3b..9b20b440277e 100644
--- a/src/Symfony/Component/Form/ResolvedFormTypeFactoryInterface.php
+++ b/src/Symfony/Component/Form/ResolvedFormTypeFactoryInterface.php
@@ -25,9 +25,7 @@ interface ResolvedFormTypeFactoryInterface
     /**
      * Resolves a form type.
      *
-     * @param FormTypeInterface              $type
-     * @param FormTypeExtensionInterface[]   $typeExtensions
-     * @param ResolvedFormTypeInterface|null $parent
+     * @param FormTypeExtensionInterface[] $typeExtensions
      *
      * @return ResolvedFormTypeInterface
      *
diff --git a/src/Symfony/Component/Form/Tests/AbstractFormTest.php b/src/Symfony/Component/Form/Tests/AbstractFormTest.php
index 4dc84e84e28a..3890354a46e0 100644
--- a/src/Symfony/Component/Form/Tests/AbstractFormTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractFormTest.php
@@ -57,7 +57,6 @@ abstract protected function createForm();
      * @param string                   $name
      * @param EventDispatcherInterface $dispatcher
      * @param string|null              $dataClass
-     * @param array                    $options
      *
      * @return FormBuilder
      */
diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
index 7ae1636ca1cb..6d897c711f10 100644
--- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
@@ -413,7 +413,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 8a8af9ed6809..e024ac3338a9 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -739,7 +739,6 @@ protected function createValidator()
     /**
      * @param string $name
      * @param string $dataClass
-     * @param array  $options
      *
      * @return FormBuilder
      */
diff --git a/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php b/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php
index f6e896874319..96bb0c4432c5 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 = [])
     {
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
index cadf70c5b410..3f5149579739 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 = [], $schemes = null)
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolverInterface.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolverInterface.php
index 5c512309662d..ba97775a9079 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolverInterface.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolverInterface.php
@@ -24,7 +24,6 @@ interface ArgumentResolverInterface
     /**
      * Returns the arguments to pass to the controller.
      *
-     * @param Request  $request
      * @param callable $controller
      *
      * @return array An array of arguments to pass to the controller
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentValueResolverInterface.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentValueResolverInterface.php
index fd7b09ecf2ed..6b14ed5be32d 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentValueResolverInterface.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentValueResolverInterface.php
@@ -24,9 +24,6 @@ interface ArgumentValueResolverInterface
     /**
      * Whether this resolver can resolve the value for the given ArgumentMetadata.
      *
-     * @param Request          $request
-     * @param ArgumentMetadata $argument
-     *
      * @return bool
      */
     public function supports(Request $request, ArgumentMetadata $argument);
@@ -34,9 +31,6 @@ public function supports(Request $request, ArgumentMetadata $argument);
     /**
      * Returns the possible value(s).
      *
-     * @param Request          $request
-     * @param ArgumentMetadata $argument
-     *
      * @return \Generator
      */
     public function resolve(Request $request, ArgumentMetadata $argument);
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
index e657f6143075..bce2f8df70e8 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -116,7 +116,6 @@ public function getArguments(Request $request, $controller)
     }
 
     /**
-     * @param Request                $request
      * @param callable               $controller
      * @param \ReflectionParameter[] $parameters
      *
diff --git a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
index fa48d0cc1157..73014abd9681 100644
--- a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
+++ b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
@@ -67,8 +67,6 @@ public function createArgumentMetadata($controller)
     /**
      * Returns whether an argument is variadic.
      *
-     * @param \ReflectionParameter $parameter
-     *
      * @return bool
      */
     private function isVariadic(\ReflectionParameter $parameter)
@@ -79,8 +77,6 @@ private function isVariadic(\ReflectionParameter $parameter)
     /**
      * Determines whether an argument has a default value.
      *
-     * @param \ReflectionParameter $parameter
-     *
      * @return bool
      */
     private function hasDefaultValue(\ReflectionParameter $parameter)
@@ -91,8 +87,6 @@ private function hasDefaultValue(\ReflectionParameter $parameter)
     /**
      * Returns a default value if available.
      *
-     * @param \ReflectionParameter $parameter
-     *
      * @return mixed|null
      */
     private function getDefaultValue(\ReflectionParameter $parameter)
@@ -103,8 +97,6 @@ private function getDefaultValue(\ReflectionParameter $parameter)
     /**
      * Returns an associated type to the given parameter if available.
      *
-     * @param \ReflectionParameter $parameter
-     *
      * @return string|null
      */
     private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function)
diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
index 378327b57410..3803105e8572 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
@@ -89,8 +89,6 @@ private function setCurrentRequest(Request $request = null)
     /**
      * After a sub-request is done, we need to reset the routing context to the parent request so that the URL generator
      * operates on the correct context again.
-     *
-     * @param FinishRequestEvent $event
      */
     public function onKernelFinishRequest(FinishRequestEvent $event)
     {
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
index 8722d8751cbc..addeca8bae14 100644
--- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -645,8 +645,6 @@ private function record(Request $request, $event)
     /**
      * Calculates the key we use in the "trace" array for a given request.
      *
-     * @param Request $request
-     *
      * @return string
      */
     private function getTraceKey(Request $request)
@@ -663,8 +661,6 @@ private function getTraceKey(Request $request)
      * Checks whether the given (cached) response may be served as "stale" when a revalidation
      * is currently in progress.
      *
-     * @param Response $entry
-     *
      * @return bool true when the stale response may be served, false otherwise
      */
     private function mayServeStaleWhileRevalidate(Response $entry)
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
index 1e19923eb7e7..bca2cd1688e8 100644
--- a/src/Symfony/Component/HttpKernel/HttpKernel.php
+++ b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -202,8 +202,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)
     {
diff --git a/src/Symfony/Component/HttpKernel/Log/Logger.php b/src/Symfony/Component/HttpKernel/Log/Logger.php
index e174587d15b8..50cbcd428f93 100644
--- a/src/Symfony/Component/HttpKernel/Log/Logger.php
+++ b/src/Symfony/Component/HttpKernel/Log/Logger.php
@@ -83,7 +83,6 @@ public function log($level, $message, array $context = [])
     /**
      * @param string $level
      * @param string $message
-     * @param array  $context
      *
      * @return string
      */
diff --git a/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
index c05c102eece2..4b9d2650e320 100644
--- a/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
@@ -91,8 +91,7 @@ public function generateData(GeneratorConfig $config)
     }
 
     /**
-     * @param LocaleScanner $scanner
-     * @param string        $sourceDir
+     * @param string $sourceDir
      *
      * @return string[]
      */
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Transformer.php
index 26a25db355ca..d61fa4d01354 100644
--- a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Transformer.php
+++ b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Transformer.php
@@ -23,7 +23,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 fbf0d3352412..c4d296a73b9d 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 da5e746df8ae..2d0d8bbbf43f 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 752f4521476c..8fc912ffc456 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/Ldap/Adapter/AdapterInterface.php b/src/Symfony/Component/Ldap/Adapter/AdapterInterface.php
index 3c2fb4b9710c..0e1cbc912668 100644
--- a/src/Symfony/Component/Ldap/Adapter/AdapterInterface.php
+++ b/src/Symfony/Component/Ldap/Adapter/AdapterInterface.php
@@ -28,7 +28,6 @@ public function getConnection();
      *
      * @param string $dn
      * @param string $query
-     * @param array  $options
      *
      * @return QueryInterface
      */
diff --git a/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php b/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
index 9538abfae2b2..f370536e2e5b 100644
--- a/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
+++ b/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
@@ -26,8 +26,6 @@ interface EntryManagerInterface
     /**
      * Adds a new entry in the Ldap server.
      *
-     * @param Entry $entry
-     *
      * @throws NotBoundException
      * @throws LdapException
      */
@@ -36,8 +34,6 @@ public function add(Entry $entry);
     /**
      * Updates an entry from the Ldap server.
      *
-     * @param Entry $entry
-     *
      * @throws NotBoundException
      * @throws LdapException
      */
@@ -46,8 +42,6 @@ public function update(Entry $entry);
     /**
      * Removes an entry from the Ldap server.
      *
-     * @param Entry $entry
-     *
      * @throws NotBoundException
      * @throws LdapException
      */
diff --git a/src/Symfony/Component/Ldap/Adapter/RenameEntryInterface.php b/src/Symfony/Component/Ldap/Adapter/RenameEntryInterface.php
index c15cb16e77e8..9d533ce2bd04 100644
--- a/src/Symfony/Component/Ldap/Adapter/RenameEntryInterface.php
+++ b/src/Symfony/Component/Ldap/Adapter/RenameEntryInterface.php
@@ -14,7 +14,6 @@ interface RenameEntryInterface
     /**
      * Renames an entry on the Ldap server.
      *
-     * @param Entry  $entry
      * @param string $newRdn
      * @param bool   $removeOldRdn
      */
diff --git a/src/Symfony/Component/Ldap/Entry.php b/src/Symfony/Component/Ldap/Entry.php
index f79c1bba71ae..281a2a76f51e 100644
--- a/src/Symfony/Component/Ldap/Entry.php
+++ b/src/Symfony/Component/Ldap/Entry.php
@@ -76,7 +76,6 @@ public function getAttributes()
      * Sets a value for the given attribute.
      *
      * @param string $name
-     * @param array  $value
      */
     public function setAttribute($name, array $value)
     {
diff --git a/src/Symfony/Component/Ldap/LdapInterface.php b/src/Symfony/Component/Ldap/LdapInterface.php
index aa6b233f3d4d..6c88ad5d0066 100644
--- a/src/Symfony/Component/Ldap/LdapInterface.php
+++ b/src/Symfony/Component/Ldap/LdapInterface.php
@@ -40,7 +40,6 @@ public function bind($dn = null, $password = null);
      *
      * @param string $dn
      * @param string $query
-     * @param array  $options
      *
      * @return QueryInterface
      */
diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php
index 01c8785d01b5..241d39efcf09 100644
--- a/src/Symfony/Component/Lock/Store/CombinedStore.php
+++ b/src/Symfony/Component/Lock/Store/CombinedStore.php
@@ -37,8 +37,7 @@ class CombinedStore implements StoreInterface, LoggerAwareInterface
     private $strategy;
 
     /**
-     * @param StoreInterface[]  $stores   The list of synchronized stores
-     * @param StrategyInterface $strategy
+     * @param StoreInterface[] $stores The list of synchronized stores
      *
      * @throws InvalidArgumentException
      */
diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php
index 2ad920313dfd..d61bc6fa069a 100644
--- a/src/Symfony/Component/Lock/Store/MemcachedStore.php
+++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php
@@ -37,8 +37,7 @@ public static function isSupported()
     }
 
     /**
-     * @param \Memcached $memcached
-     * @param int        $initialTtl the expiration delay of locks in seconds
+     * @param int $initialTtl the expiration delay of locks in seconds
      */
     public function __construct(\Memcached $memcached, $initialTtl = 300)
     {
@@ -148,8 +147,6 @@ public function exists(Key $key)
     /**
      * Retrieve an unique token for the given key.
      *
-     * @param Key $key
-     *
      * @return string
      */
     private function getToken(Key $key)
diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php
index 6ad47a33378c..6e532f83cfb7 100644
--- a/src/Symfony/Component/Lock/Store/RedisStore.php
+++ b/src/Symfony/Component/Lock/Store/RedisStore.php
@@ -126,7 +126,6 @@ public function exists(Key $key)
      *
      * @param string $script
      * @param string $resource
-     * @param array  $args
      *
      * @return mixed
      */
@@ -150,8 +149,6 @@ private function evaluate($script, $resource, array $args)
     /**
      * Retrieves an unique token for the given key.
      *
-     * @param Key $key
-     *
      * @return string
      */
     private function getToken(Key $key)
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index 056a0d7e8ef3..05873c0e7ba4 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -194,7 +194,6 @@ public function __clone()
      *
      * @param callable|null $callback A PHP callback to run whenever there is some
      *                                output available on STDOUT or STDERR
-     * @param array         $env      An array of additional env vars to set when running the process
      *
      * @return int The exit status code
      *
@@ -218,9 +217,6 @@ public function run($callback = null/*, array $env = []*/)
      * This is identical to run() except that an exception is thrown if the process
      * exits with a non-zero exit code.
      *
-     * @param callable|null $callback
-     * @param array         $env      An array of additional env vars to set when running the process
-     *
      * @return self
      *
      * @throws RuntimeException       if PHP was compiled with --enable-sigchild and the enhanced sigchild compatibility mode is not enabled
@@ -256,7 +252,6 @@ public function mustRun(callable $callback = null/*, array $env = []*/)
      *
      * @param callable|null $callback A PHP callback to run whenever there is some
      *                                output available on STDOUT or STDERR
-     * @param array         $env      An array of additional env vars to set when running the process
      *
      * @throws RuntimeException When process can't be launched
      * @throws RuntimeException When process is already running
@@ -367,7 +362,6 @@ public function start(callable $callback = null/*, array $env = [*/)
      *
      * @param callable|null $callback A PHP callback to run whenever there is some
      *                                output available on STDOUT or STDERR
-     * @param array         $env      An array of additional env vars to set when running the process
      *
      * @return $this
      *
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
index 8eed938e5033..55b2fabbfcc8 100644
--- a/src/Symfony/Component/Process/Tests/ProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1529,10 +1529,8 @@ public function testWaitStoppedDeadProcess()
     /**
      * @param string      $commandline
      * @param string|null $cwd
-     * @param array|null  $env
      * @param string|null $input
      * @param int         $timeout
-     * @param array       $options
      *
      * @return Process
      */
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
index e36211bd65cb..9aab91638cbd 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -905,10 +905,9 @@ private function getPropertyPath($propertyPath)
     /**
      * Creates the APCu adapter if applicable.
      *
-     * @param string               $namespace
-     * @param int                  $defaultLifetime
-     * @param string               $version
-     * @param LoggerInterface|null $logger
+     * @param string $namespace
+     * @param int    $defaultLifetime
+     * @param string $version
      *
      * @return AdapterInterface
      *
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
index 1db6a1dba23e..7283c80a4f78 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
@@ -100,8 +100,6 @@ public function isExceptionOnInvalidIndexEnabled()
     /**
      * Sets a cache system.
      *
-     * @param CacheItemPoolInterface|null $cacheItemPool
-     *
      * @return PropertyAccessorBuilder The builder object
      */
     public function setCacheItemPool(CacheItemPoolInterface $cacheItemPool = null)
diff --git a/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php b/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php
index 49d5afb032c4..90f44f34ff30 100644
--- a/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php
+++ b/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php
@@ -23,7 +23,6 @@ interface PropertyAccessExtractorInterface
      *
      * @param string $class
      * @param string $property
-     * @param array  $context
      *
      * @return bool|null
      */
@@ -34,7 +33,6 @@ public function isReadable($class, $property, array $context = []);
      *
      * @param string $class
      * @param string $property
-     * @param array  $context
      *
      * @return bool|null
      */
diff --git a/src/Symfony/Component/PropertyInfo/PropertyDescriptionExtractorInterface.php b/src/Symfony/Component/PropertyInfo/PropertyDescriptionExtractorInterface.php
index 385e772b9f09..3a5f7ebe991c 100644
--- a/src/Symfony/Component/PropertyInfo/PropertyDescriptionExtractorInterface.php
+++ b/src/Symfony/Component/PropertyInfo/PropertyDescriptionExtractorInterface.php
@@ -23,7 +23,6 @@ interface PropertyDescriptionExtractorInterface
      *
      * @param string $class
      * @param string $property
-     * @param array  $context
      *
      * @return string|null
      */
@@ -34,7 +33,6 @@ public function getShortDescription($class, $property, array $context = []);
      *
      * @param string $class
      * @param string $property
-     * @param array  $context
      *
      * @return string|null
      */
diff --git a/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php b/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php
index 6f348095e8d6..9b83ce97b3e5 100644
--- a/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php
@@ -84,7 +84,6 @@ public function getTypes($class, $property, array $context = [])
      * Retrieves the cached data if applicable or delegates to the decorated extractor.
      *
      * @param string $method
-     * @param array  $arguments
      *
      * @return mixed
      */
diff --git a/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php b/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php
index 58cea0880b8d..bb6482ff7bb6 100644
--- a/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php
@@ -92,7 +92,6 @@ public function isWritable($class, $property, array $context = [])
      *
      * @param iterable $extractors
      * @param string   $method
-     * @param array    $arguments
      *
      * @return mixed
      */
diff --git a/src/Symfony/Component/PropertyInfo/PropertyListExtractorInterface.php b/src/Symfony/Component/PropertyInfo/PropertyListExtractorInterface.php
index 2c831731cf69..38e69aa01fd7 100644
--- a/src/Symfony/Component/PropertyInfo/PropertyListExtractorInterface.php
+++ b/src/Symfony/Component/PropertyInfo/PropertyListExtractorInterface.php
@@ -22,7 +22,6 @@ interface PropertyListExtractorInterface
      * Gets the list of properties available for the given class.
      *
      * @param string $class
-     * @param array  $context
      *
      * @return string[]|null
      */
diff --git a/src/Symfony/Component/PropertyInfo/PropertyTypeExtractorInterface.php b/src/Symfony/Component/PropertyInfo/PropertyTypeExtractorInterface.php
index c970530f2e93..5e8824627da5 100644
--- a/src/Symfony/Component/PropertyInfo/PropertyTypeExtractorInterface.php
+++ b/src/Symfony/Component/PropertyInfo/PropertyTypeExtractorInterface.php
@@ -23,7 +23,6 @@ interface PropertyTypeExtractorInterface
      *
      * @param string $class
      * @param string $property
-     * @param array  $context
      *
      * @return Type[]|null
      */
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
index 6b8a50efb731..9ecb554df866 100644
--- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -32,7 +32,6 @@
  * recognizes several parameters: requirements, options, defaults, schemes,
  * methods, host, and name. The name parameter is mandatory.
  * Here is an example of how you should be able to use it:
- *
  *     /**
  *      * @Route("/Blog")
  *      * /
@@ -44,7 +43,6 @@
  *         public function index()
  *         {
  *         }
- *
  *         /**
  *          * @Route("/{id}", name="blog_post", requirements = {"id" = "\d+"})
  *          * /
@@ -192,9 +190,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/RouteCollectionBuilder.php b/src/Symfony/Component/Routing/RouteCollectionBuilder.php
index 800e448cf3b4..45f9e3d3912d 100644
--- a/src/Symfony/Component/Routing/RouteCollectionBuilder.php
+++ b/src/Symfony/Component/Routing/RouteCollectionBuilder.php
@@ -127,7 +127,6 @@ public function mount($prefix, self $builder)
     /**
      * Adds a Route object to the builder.
      *
-     * @param Route       $route
      * @param string|null $name
      *
      * @return $this
diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentToken.php
index c6b76c2e6b03..95e86f0b0d6f 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/RememberMe/TokenProviderInterface.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
index 58ac22c2ec2b..6404dfc31eac 100644
--- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
+++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
@@ -41,9 +41,8 @@ public function deleteTokenBySeries($series);
     /**
      * Updates the token according to this data.
      *
-     * @param string    $series
-     * @param string    $tokenValue
-     * @param \DateTime $lastUsed
+     * @param string $series
+     * @param string $tokenValue
      *
      * @throws TokenNotFoundException if the token is not found
      */
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php
index 6e846dd27c18..ae5b919a2ee1 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        $secret      A secret used to make sure the token is created by the app and not by a malicious client
+     * @param string $providerKey
+     * @param string $secret      A secret used to make sure the token is created by the app and not by a malicious client
      *
      * @throws \InvalidArgumentException
      */
diff --git a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
index 31744d341356..2ab69a37ec72 100644
--- a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
+++ b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php
@@ -31,7 +31,6 @@ class AuthorizationChecker implements AuthorizationCheckerInterface
     private $alwaysAuthenticate;
 
     /**
-     * @param TokenStorageInterface          $tokenStorage
      * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManager instance
      * @param AccessDecisionManagerInterface $accessDecisionManager An AccessDecisionManager instance
      * @param bool                           $alwaysAuthenticate
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/Voter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/Voter.php
index 0641486b7a13..6665753fe111 100644
--- a/src/Symfony/Component/Security/Core/Authorization/Voter/Voter.php
+++ b/src/Symfony/Component/Security/Core/Authorization/Voter/Voter.php
@@ -60,9 +60,8 @@ abstract protected function supports($attribute, $subject);
      * Perform a single access check operation on a given attribute, subject and token.
      * It is safe to assume that $attribute and $subject already passed the "supports()" method check.
      *
-     * @param string         $attribute
-     * @param mixed          $subject
-     * @param TokenInterface $token
+     * @param string $attribute
+     * @param mixed  $subject
      *
      * @return bool
      */
diff --git a/src/Symfony/Component/Security/Core/User/LdapUserProvider.php b/src/Symfony/Component/Security/Core/User/LdapUserProvider.php
index f840024a813e..18413a7dc92b 100644
--- a/src/Symfony/Component/Security/Core/User/LdapUserProvider.php
+++ b/src/Symfony/Component/Security/Core/User/LdapUserProvider.php
@@ -36,14 +36,12 @@ class LdapUserProvider implements UserProviderInterface
     private $passwordAttribute;
 
     /**
-     * @param LdapInterface $ldap
-     * @param string        $baseDn
-     * @param string        $searchDn
-     * @param string        $searchPassword
-     * @param array         $defaultRoles
-     * @param string        $uidKey
-     * @param string        $filter
-     * @param string        $passwordAttribute
+     * @param string $baseDn
+     * @param string $searchDn
+     * @param string $searchPassword
+     * @param string $uidKey
+     * @param string $filter
+     * @param string $passwordAttribute
      */
     public function __construct(LdapInterface $ldap, $baseDn, $searchDn = null, $searchPassword = null, array $defaultRoles = [], $uidKey = 'sAMAccountName', $filter = '({uid_key}={username})', $passwordAttribute = null)
     {
@@ -122,7 +120,6 @@ public function supportsClass($class)
      * Loads a user from an LDAP entry.
      *
      * @param string $username
-     * @param Entry  $entry
      *
      * @return User
      */
diff --git a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
index 24a16e3f0c52..e2ffb240504d 100644
--- a/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
+++ b/src/Symfony/Component/Security/Guard/GuardAuthenticatorHandler.php
@@ -51,8 +51,6 @@ public function __construct(TokenStorageInterface $tokenStorage, EventDispatcher
 
     /**
      * Authenticates the given token in the system.
-     *
-     * @param string $providerKey The name of the provider/firewall being used for authentication
      */
     public function authenticateWithToken(TokenInterface $token, Request $request/*, string $providerKey */)
     {
diff --git a/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php b/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
index b8cc4b7ee54b..a78a21d49de0 100644
--- a/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
+++ b/src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
@@ -44,7 +44,6 @@ class GuardAuthenticationProvider implements AuthenticationProviderInterface
      * @param iterable|AuthenticatorInterface[] $guardAuthenticators The authenticators, with keys that match what's passed to GuardAuthenticationListener
      * @param UserProviderInterface             $userProvider        The user provider
      * @param string                            $providerKey         The provider (i.e. firewall) key
-     * @param UserCheckerInterface              $userChecker
      */
     public function __construct($guardAuthenticators, UserProviderInterface $userProvider, $providerKey, UserCheckerInterface $userChecker)
     {
diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
index 8b65dc9ee592..f0580320f4df 100644
--- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
+++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
@@ -40,8 +40,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 = [])
     {
diff --git a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php
index 44462d7c41af..9df46a2c0dfd 100644
--- a/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php
+++ b/src/Symfony/Component/Security/Http/EntryPoint/FormAuthenticationEntryPoint.php
@@ -29,10 +29,9 @@ 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 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
      */
     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 252669a8395f..f6f368451000 100644
--- a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
@@ -64,17 +64,14 @@ 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 TokenStorageInterface          $tokenStorage          A TokenStorageInterface instance
+     * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance
+     * @param HttpUtils                      $httpUtils             An HttpUtils 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 6a762e1fbd57..f33446483470 100644
--- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php
@@ -38,7 +38,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
diff --git a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
index 17d40a0e6f82..0643c11a5557 100644
--- a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
@@ -39,13 +39,7 @@ 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
-     * @param SessionAuthenticationStrategyInterface|null $sessionStrategy
+     * @param bool $catchExceptions
      */
     public function __construct(TokenStorageInterface $tokenStorage, RememberMeServicesInterface $rememberMeServices, AuthenticationManagerInterface $authenticationManager, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, $catchExceptions = true, SessionAuthenticationStrategyInterface $sessionStrategy = null)
     {
diff --git a/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
index de985fb3155d..b21a50d56d5c 100644
--- a/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php
@@ -38,19 +38,16 @@ 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 TokenStorageInterface                 $tokenStorage          A TokenStorageInterface instance
+     * @param AuthenticationManagerInterface        $authenticationManager An AuthenticationManagerInterface instance
+     * @param HttpUtils                             $httpUtils             An HttpUtils 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
      */
diff --git a/src/Symfony/Component/Security/Http/Logout/DefaultLogoutSuccessHandler.php b/src/Symfony/Component/Security/Http/Logout/DefaultLogoutSuccessHandler.php
index 48626b069035..b0519c0db7bd 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/Logout/LogoutUrlGenerator.php b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
index 2e531bbbe28b..95ccdbf87f4d 100644
--- a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
+++ b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php
@@ -46,7 +46,6 @@ public function __construct(RequestStack $requestStack = null, UrlGeneratorInter
      * @param string                         $csrfTokenId      The ID of the CSRF token
      * @param string                         $csrfParameter    The CSRF token parameter name
      * @param CsrfTokenManagerInterface|null $csrfTokenManager A CsrfTokenManagerInterface instance
-     * @param string|null                    $context          The listener context
      */
     public function registerListener($key, $logoutPath, $csrfTokenId, $csrfParameter, CsrfTokenManagerInterface $csrfTokenManager = null/*, string $context = null*/)
     {
diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
index 54c9134828f1..8be684df9ddf 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
@@ -44,10 +44,8 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
     private $userProviders;
 
     /**
-     * @param array           $userProviders
      * @param string          $secret
      * @param string          $providerKey
-     * @param array           $options
      * @param LoggerInterface $logger
      *
      * @throws \InvalidArgumentException
diff --git a/src/Symfony/Component/Security/Http/Util/TargetPathTrait.php b/src/Symfony/Component/Security/Http/Util/TargetPathTrait.php
index 87ff333e05f6..97acaaa1d98d 100644
--- a/src/Symfony/Component/Security/Http/Util/TargetPathTrait.php
+++ b/src/Symfony/Component/Security/Http/Util/TargetPathTrait.php
@@ -23,9 +23,8 @@ trait TargetPathTrait
      *
      * Usually, you do not need to set this directly.
      *
-     * @param SessionInterface $session
-     * @param string           $providerKey The name of your firewall
-     * @param string           $uri         The URI to set as the target path
+     * @param string $providerKey The name of your firewall
+     * @param string $uri         The URI to set as the target path
      */
     private function saveTargetPath(SessionInterface $session, $providerKey, $uri)
     {
@@ -35,8 +34,7 @@ private function saveTargetPath(SessionInterface $session, $providerKey, $uri)
     /**
      * Returns the URL (if any) the user visited that forced them to login.
      *
-     * @param SessionInterface $session
-     * @param string           $providerKey The name of your firewall
+     * @param string $providerKey The name of your firewall
      *
      * @return string|null
      */
@@ -48,8 +46,7 @@ private function getTargetPath(SessionInterface $session, $providerKey)
     /**
      * Removes the target path from the session.
      *
-     * @param SessionInterface $session
-     * @param string           $providerKey The name of your firewall
+     * @param string $providerKey The name of your firewall
      */
     private function removeTargetPath(SessionInterface $session, $providerKey)
     {
diff --git a/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php b/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
index 1c76fe4bba0a..c51188140bcf 100644
--- a/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
@@ -60,7 +60,6 @@ public function supportsDecoding($format/*, array $context = []*/)
      * Gets the decoder supporting the format.
      *
      * @param string $format
-     * @param array  $context
      *
      * @return DecoderInterface
      *
diff --git a/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php b/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php
index a0a718356c85..8b24e27a78fa 100644
--- a/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php
@@ -60,7 +60,6 @@ public function supportsEncoding($format/*, array $context = []*/)
      * Checks whether the normalization is needed for the given format.
      *
      * @param string $format
-     * @param array  $context
      *
      * @return bool
      */
@@ -84,7 +83,6 @@ public function needsNormalization($format/*, array $context = []*/)
      * Gets the encoder supporting the format.
      *
      * @param string $format
-     * @param array  $context
      *
      * @return EncoderInterface
      *
diff --git a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
index 2552e300941c..79abf30ea5a9 100644
--- a/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
@@ -178,8 +178,6 @@ public function supportsDecoding($format)
     /**
      * Flattens an array and generates keys including the path.
      *
-     * @param array  $array
-     * @param array  $result
      * @param string $keySeparator
      * @param string $parentKey
      */
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index afbd63e4962a..3a76665a0bca 100644
--- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -177,8 +177,7 @@ public function getRootNodeName()
     }
 
     /**
-     * @param \DOMNode $node
-     * @param string   $val
+     * @param string $val
      *
      * @return bool
      */
@@ -196,8 +195,7 @@ final protected function appendXMLString(\DOMNode $node, $val)
     }
 
     /**
-     * @param \DOMNode $node
-     * @param string   $val
+     * @param string $val
      *
      * @return bool
      */
@@ -210,8 +208,7 @@ final protected function appendText(\DOMNode $node, $val)
     }
 
     /**
-     * @param \DOMNode $node
-     * @param string   $val
+     * @param string $val
      *
      * @return bool
      */
@@ -224,7 +221,6 @@ final protected function appendCData(\DOMNode $node, $val)
     }
 
     /**
-     * @param \DOMNode             $node
      * @param \DOMDocumentFragment $fragment
      *
      * @return bool
@@ -368,7 +364,6 @@ private function parseXmlValue(\DOMNode $node, array $context = [])
     /**
      * Parse the data and convert it to DOMElements.
      *
-     * @param \DOMNode     $parentNode
      * @param array|object $data
      * @param string|null  $xmlRootNodeName
      *
@@ -437,7 +432,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
@@ -474,8 +468,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
      *
@@ -523,8 +516,6 @@ private function resolveXmlRootName(array $context = [])
     /**
      * Get XML option for type casting attributes Defaults to true.
      *
-     * @param array $context
-     *
      * @return bool
      */
     private function resolveXmlTypeCastAttributes(array $context = [])
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
index b6aea185e789..bf9afb701e45 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -96,8 +96,6 @@ public function setCircularReferenceLimit($circularReferenceLimit)
     /**
      * Set circular reference handler.
      *
-     * @param callable $circularReferenceHandler
-     *
      * @return self
      */
     public function setCircularReferenceHandler(callable $circularReferenceHandler)
@@ -194,7 +192,6 @@ protected function handleCircularReference($object)
      * Gets attributes to normalize using groups.
      *
      * @param string|object $classOrObject
-     * @param array         $context
      * @param bool          $attributesAsString If false, return an array of {@link AttributeMetadataInterface}
      *
      * @throws LogicException if the 'allow_extra_attributes' context variable is false and no class metadata factory is provided
@@ -239,7 +236,6 @@ protected function getAllowedAttributes($classOrObject, array $context, $attribu
      * @param object|string $classOrObject
      * @param string        $attribute
      * @param string|null   $format
-     * @param array         $context
      *
      * @return bool
      */
@@ -278,11 +274,8 @@ protected function prepareForDenormalization($data)
      * Returns the method to use to construct an object. This method must be either
      * the object constructor or static.
      *
-     * @param array            $data
-     * @param string           $class
-     * @param array            $context
-     * @param \ReflectionClass $reflectionClass
-     * @param array|bool       $allowedAttributes
+     * @param string     $class
+     * @param array|bool $allowedAttributes
      *
      * @return \ReflectionMethod|null
      */
@@ -299,12 +292,8 @@ protected function getConstructor(array &$data, $class, array &$context, \Reflec
      * 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|null      $format
+     * @param string     $class
+     * @param array|bool $allowedAttributes
      *
      * @return object
      *
@@ -413,9 +402,7 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara
     }
 
     /**
-     * @param array       $parentContext
-     * @param string      $attribute     Attribute name
-     * @param string|null $format
+     * @param string $attribute Attribute name
      *
      * @return array
      *
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index 7201e5c09575..29d90bfbd67f 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -105,7 +105,6 @@ public function normalize($object, $format = null, array $context = [])
      *
      * @param object      $object
      * @param string|null $format
-     * @param array       $context
      *
      * @return string[]
      */
@@ -142,7 +141,6 @@ protected function getAttributes($object, $format = null, array $context)
      *
      * @param object      $object
      * @param string|null $format
-     * @param array       $context
      *
      * @return string[]
      */
@@ -154,7 +152,6 @@ abstract protected function extractAttributes($object, $format = null, array $co
      * @param object      $object
      * @param string      $attribute
      * @param string|null $format
-     * @param array       $context
      *
      * @return mixed
      */
@@ -219,7 +216,6 @@ public function denormalize($data, $class, $format = null, array $context = [])
      * @param string      $attribute
      * @param mixed       $value
      * @param string|null $format
-     * @param array       $context
      */
     abstract protected function setAttributeValue($object, $attribute, $value, $format = null, array $context = []);
 
@@ -230,7 +226,6 @@ abstract protected function setAttributeValue($object, $attribute, $value, $form
      * @param string      $attribute
      * @param mixed       $data
      * @param string|null $format
-     * @param array       $context
      *
      * @return mixed
      *
@@ -339,7 +334,6 @@ private function updateData(array $data, $attribute, $attributeValue)
      * @param AttributeMetadataInterface[] $attributesMetadata
      * @param string                       $class
      * @param string                       $attribute
-     * @param array                        $context
      *
      * @return bool
      */
@@ -399,7 +393,6 @@ protected function createChildContext(array $parentContext, $attribute/*, string
      * The key must be different for every option in the context that could change which attributes should be handled.
      *
      * @param string|null $format
-     * @param array       $context
      *
      * @return bool|string
      */
diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
index 185b44be4eea..58ce6c2f0244 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@@ -122,8 +122,6 @@ public function supportsDenormalization($data, $type, $format = null)
     /**
      * Gets the mime type of the object. Defaults to application/octet-stream.
      *
-     * @param \SplFileInfo $object
-     *
      * @return string
      */
     private function getMimeType(\SplFileInfo $object)
@@ -142,8 +140,6 @@ private function getMimeType(\SplFileInfo $object)
     /**
      * Returns the \SplFileObject instance associated with the given \SplFileInfo instance.
      *
-     * @param \SplFileInfo $object
-     *
      * @return \SplFileObject
      */
     private function extractSplFileObject(\SplFileInfo $object)
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
index 86c3b8d0293a..978237510b0d 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
@@ -35,8 +35,7 @@ class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface
     ];
 
     /**
-     * @param string             $format
-     * @param \DateTimeZone|null $timezone
+     * @param string $format
      */
     public function __construct($format = \DateTime::RFC3339, \DateTimeZone $timezone = null)
     {
diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php
index 4a6a4e26e92d..87bfb842290e 100644
--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerAwareInterface.php
@@ -20,8 +20,6 @@ interface DenormalizerAwareInterface
 {
     /**
      * Sets the owning Denormalizer object.
-     *
-     * @param DenormalizerInterface $denormalizer
      */
     public function setDenormalizer(DenormalizerInterface $denormalizer);
 }
diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareInterface.php
index 55015fe6658b..be380912b1ca 100644
--- a/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerAwareInterface.php
@@ -20,8 +20,6 @@ interface NormalizerAwareInterface
 {
     /**
      * Sets the owning Normalizer object.
-     *
-     * @param NormalizerInterface $normalizer
      */
     public function setNormalizer(NormalizerInterface $normalizer);
 }
diff --git a/src/Symfony/Component/Serializer/SerializerInterface.php b/src/Symfony/Component/Serializer/SerializerInterface.php
index 7a03ef943a20..aca146c156a0 100644
--- a/src/Symfony/Component/Serializer/SerializerInterface.php
+++ b/src/Symfony/Component/Serializer/SerializerInterface.php
@@ -35,7 +35,6 @@ public function serialize($data, $format, array $context = []);
      * @param mixed  $data
      * @param string $type
      * @param string $format
-     * @param array  $context
      *
      * @return object
      */
diff --git a/src/Symfony/Component/Translation/Dumper/FileDumper.php b/src/Symfony/Component/Translation/Dumper/FileDumper.php
index 102f9285842f..62a6caa4d0a8 100644
--- a/src/Symfony/Component/Translation/Dumper/FileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/FileDumper.php
@@ -92,9 +92,7 @@ public function dump(MessageCatalogue $messages, $options = [])
     /**
      * Transforms a domain of a message catalogue to its string representation.
      *
-     * @param MessageCatalogue $messages
-     * @param string           $domain
-     * @param array            $options
+     * @param string $domain
      *
      * @return string representation
      */
diff --git a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
index 8ded66d20a34..539f78ec8585 100644
--- a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
+++ b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php
@@ -198,8 +198,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/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
index e6750826237d..9d7a83ab84c3 100644
--- a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -116,9 +116,7 @@ private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, $
     }
 
     /**
-     * @param \DOMDocument     $dom
-     * @param MessageCatalogue $catalogue
-     * @param string           $domain
+     * @param string $domain
      */
     private function extractXliff2(\DOMDocument $dom, MessageCatalogue $catalogue, $domain)
     {
@@ -182,9 +180,8 @@ private function utf8ToCharset($content, $encoding = null)
     /**
      * Validates and parses the given file into a DOMDocument.
      *
-     * @param string       $file
-     * @param \DOMDocument $dom
-     * @param string       $schema source of the schema
+     * @param string $file
+     * @param string $schema source of the schema
      *
      * @throws InvalidResourceException
      */
@@ -284,8 +281,6 @@ private function getXmlErrors($internalErrors)
      * Gets xliff file version based on the root "version" attribute.
      * Defaults to 1.2 for backwards compatibility.
      *
-     * @param \DOMDocument $dom
-     *
      * @throws InvalidArgumentException
      *
      * @return string
@@ -314,8 +309,7 @@ private function getVersionNumber(\DOMDocument $dom)
     }
 
     /**
-     * @param \SimpleXMLElement|null $noteElement
-     * @param string|null            $encoding
+     * @param string|null $encoding
      *
      * @return array
      */
diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php
index 306776e007d3..942736ea7fdf 100644
--- a/src/Symfony/Component/Translation/LoggingTranslator.php
+++ b/src/Symfony/Component/Translation/LoggingTranslator.php
@@ -28,7 +28,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/Reader/TranslationReader.php b/src/Symfony/Component/Translation/Reader/TranslationReader.php
index e4554f39b4ee..2b9834521921 100644
--- a/src/Symfony/Component/Translation/Reader/TranslationReader.php
+++ b/src/Symfony/Component/Translation/Reader/TranslationReader.php
@@ -32,8 +32,7 @@ class TranslationReader implements TranslationReaderInterface
     /**
      * 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)
     {
diff --git a/src/Symfony/Component/Translation/Reader/TranslationReaderInterface.php b/src/Symfony/Component/Translation/Reader/TranslationReaderInterface.php
index 0aa55c6d367d..0b2ad332a94e 100644
--- a/src/Symfony/Component/Translation/Reader/TranslationReaderInterface.php
+++ b/src/Symfony/Component/Translation/Reader/TranslationReaderInterface.php
@@ -23,8 +23,7 @@ interface TranslationReaderInterface
     /**
      * Reads translation messages from a directory to the catalogue.
      *
-     * @param string           $directory
-     * @param MessageCatalogue $catalogue
+     * @param string $directory
      */
     public function read($directory, MessageCatalogue $catalogue);
 }
diff --git a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
index f7bfd2902e5c..d39c87319a59 100644
--- a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
@@ -86,8 +86,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/GroupSequence.php b/src/Symfony/Component/Validator/Constraints/GroupSequence.php
index fc34ca1a458e..be5bdc4bec40 100644
--- a/src/Symfony/Component/Validator/Constraints/GroupSequence.php
+++ b/src/Symfony/Component/Validator/Constraints/GroupSequence.php
@@ -28,7 +28,6 @@
  *
  * When adding metadata to a class, you can override the "Default" group of
  * that class with a group sequence:
- *
  *     /**
  *      * @GroupSequence({"Address", "Strict"})
  *      *\/
diff --git a/src/Symfony/Component/Validator/Constraints/LuhnValidator.php b/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
index 6e69f9ee74c2..89ebfdcc5c54 100644
--- a/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/LuhnValidator.php
@@ -32,8 +32,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/Workflow/Event/Event.php b/src/Symfony/Component/Workflow/Event/Event.php
index a268a373c08c..4bf5d1fcb75b 100644
--- a/src/Symfony/Component/Workflow/Event/Event.php
+++ b/src/Symfony/Component/Workflow/Event/Event.php
@@ -27,10 +27,8 @@ class Event extends BaseEvent
     private $workflowName;
 
     /**
-     * @param object     $subject
-     * @param Marking    $marking
-     * @param Transition $transition
-     * @param string     $workflowName
+     * @param object $subject
+     * @param string $workflowName
      */
     public function __construct($subject, Marking $marking, Transition $transition, $workflowName = 'unnamed')
     {
diff --git a/src/Symfony/Component/Workflow/MarkingStore/MultipleStateMarkingStore.php b/src/Symfony/Component/Workflow/MarkingStore/MultipleStateMarkingStore.php
index 926f96fa85ec..f735183cff03 100644
--- a/src/Symfony/Component/Workflow/MarkingStore/MultipleStateMarkingStore.php
+++ b/src/Symfony/Component/Workflow/MarkingStore/MultipleStateMarkingStore.php
@@ -30,8 +30,7 @@ class MultipleStateMarkingStore implements MarkingStoreInterface
     private $propertyAccessor;
 
     /**
-     * @param string                         $property
-     * @param PropertyAccessorInterface|null $propertyAccessor
+     * @param string $property
      */
     public function __construct($property = 'marking', PropertyAccessorInterface $propertyAccessor = null)
     {
diff --git a/src/Symfony/Component/Workflow/MarkingStore/SingleStateMarkingStore.php b/src/Symfony/Component/Workflow/MarkingStore/SingleStateMarkingStore.php
index 82ddb9cd1a8c..daccc65b4160 100644
--- a/src/Symfony/Component/Workflow/MarkingStore/SingleStateMarkingStore.php
+++ b/src/Symfony/Component/Workflow/MarkingStore/SingleStateMarkingStore.php
@@ -29,8 +29,7 @@ class SingleStateMarkingStore implements MarkingStoreInterface
     private $propertyAccessor;
 
     /**
-     * @param string                         $property
-     * @param PropertyAccessorInterface|null $propertyAccessor
+     * @param string $property
      */
     public function __construct($property = 'marking', PropertyAccessorInterface $propertyAccessor = null)
     {
diff --git a/src/Symfony/Component/Workflow/Registry.php b/src/Symfony/Component/Workflow/Registry.php
index 93fb7233d16a..8d3d19a7a34c 100644
--- a/src/Symfony/Component/Workflow/Registry.php
+++ b/src/Symfony/Component/Workflow/Registry.php
@@ -24,7 +24,6 @@ class Registry
     private $workflows = [];
 
     /**
-     * @param Workflow                        $workflow
      * @param string|SupportStrategyInterface $supportStrategy
      */
     public function add(Workflow $workflow, $supportStrategy)
diff --git a/src/Symfony/Component/Workflow/SupportStrategy/SupportStrategyInterface.php b/src/Symfony/Component/Workflow/SupportStrategy/SupportStrategyInterface.php
index 097c6c4d9fe7..c346977790f3 100644
--- a/src/Symfony/Component/Workflow/SupportStrategy/SupportStrategyInterface.php
+++ b/src/Symfony/Component/Workflow/SupportStrategy/SupportStrategyInterface.php
@@ -19,8 +19,7 @@
 interface SupportStrategyInterface
 {
     /**
-     * @param Workflow $workflow
-     * @param object   $subject
+     * @param object $subject
      *
      * @return bool
      */
diff --git a/src/Symfony/Component/Workflow/Validator/DefinitionValidatorInterface.php b/src/Symfony/Component/Workflow/Validator/DefinitionValidatorInterface.php
index 244dceae9a9d..74d901eee49e 100644
--- a/src/Symfony/Component/Workflow/Validator/DefinitionValidatorInterface.php
+++ b/src/Symfony/Component/Workflow/Validator/DefinitionValidatorInterface.php
@@ -20,8 +20,7 @@
 interface DefinitionValidatorInterface
 {
     /**
-     * @param Definition $definition
-     * @param string     $name
+     * @param string $name
      *
      * @throws InvalidDefinitionException on invalid definition
      */
diff --git a/src/Symfony/Component/Workflow/Workflow.php b/src/Symfony/Component/Workflow/Workflow.php
index 18ca7f796902..e54d85bc29df 100644
--- a/src/Symfony/Component/Workflow/Workflow.php
+++ b/src/Symfony/Component/Workflow/Workflow.php
@@ -215,9 +215,7 @@ private function doCan($subject, Marking $marking, Transition $transition)
     }
 
     /**
-     * @param object     $subject
-     * @param Marking    $marking
-     * @param Transition $transition
+     * @param object $subject
      *
      * @return bool|void boolean true if this transition is guarded, ie you cannot use it
      */