symfony · fabpot · Jan 23, 2018
diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -40,8 +40,7 @@ public function __construct(ManagerRegistry $registry)
    /**
     * Adds the stack logger for a connection.
     *
-     * @param string     $name
-     * @param DebugStack $logger
+     * @param string $name
     */
    public function addLogger($name, DebugStack $logger)
    {

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -36,8 +36,7 @@ abstract class AbstractDoctrineExtension extends Extension
    protected $drivers = array();

    /**
-     * @param array            $objectManager A configured object manager
-     * @param ContainerBuilder $container     A ContainerBuilder instance
+     * @param array $objectManager A configured object manager
     *
     * @throws \InvalidArgumentException
     */
@@ -118,7 +117,6 @@ protected function setMappingDriverAlias($mappingConfig, $mappingName)
    /**
     * Register the mapping driver configuration for later use with the object managers metadata driver chain.
     *
-     * @param array  $mappingConfig
     * @param string $mappingName
     *
     * @throws \InvalidArgumentException
@@ -173,8 +171,7 @@ protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \Re
    /**
     * Register all the collected mapping information with the object manager by registering the appropriate mapping drivers.
     *
-     * @param array            $objectManager
-     * @param ContainerBuilder $container     A ContainerBuilder instance
+     * @param array $objectManager
     */
    protected function registerMappingDrivers($objectManager, ContainerBuilder $container)
    {
@@ -226,7 +223,6 @@ protected function registerMappingDrivers($objectManager, ContainerBuilder $cont
    /**
     * Assertion if the specified mapping information is valid.
     *
-     * @param array  $mappingConfig
     * @param string $objectManagerName
     *
     * @throws \InvalidArgumentException
@@ -253,8 +249,7 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object
    /**
     * Detects what metadata driver to use for the supplied directory.
     *
-     * @param string           $dir       A directory path
-     * @param ContainerBuilder $container A ContainerBuilder instance
+     * @param string $dir A directory path
     *
     * @return string|null A metadata driver short name, if one can be detected
     */
@@ -289,9 +284,8 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
    /**
     * Loads a configured object manager metadata, query or result cache driver.
     *
-     * @param array            $objectManager A configured object manager
-     * @param ContainerBuilder $container     A ContainerBuilder instance
-     * @param string           $cacheName
+     * @param array  $objectManager A configured object manager
+     * @param string $cacheName
     *
     * @throws \InvalidArgumentException in case of unknown driver type
     */
@@ -303,10 +297,9 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB
    /**
     * Loads a cache driver.
     *
-     * @param string           $cacheName         The cache driver name
-     * @param string           $objectManagerName The object manager name
-     * @param array            $cacheDriver       The cache driver mapping
-     * @param ContainerBuilder $container         The ContainerBuilder instance
+     * @param string $cacheName         The cache driver name
+     * @param string $objectManagerName The object manager name
+     * @param array  $cacheDriver       The cache driver mapping
     *
     * @return string
     *

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
@@ -45,9 +45,8 @@ public function process(ContainerBuilder $container)
     * Gets the validation mapping files for the format and extends them with
     * files matching a doctrine search pattern (Resources/config/validation.orm.xml).
     *
-     * @param ContainerBuilder $container
-     * @param string           $mapping
-     * @param string           $extension
+     * @param string $mapping
+     * @param string $extension
     */
    private function updateValidatorMappingFiles(ContainerBuilder $container, $mapping, $extension)
    {

diff --git a/...ge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/...ge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -135,8 +135,7 @@ private function getEventManagerDef(ContainerBuilder $container, $name)
     * @see https://bugs.php.net/bug.php?id=53710
     * @see https://bugs.php.net/bug.php?id=60926
     *
-     * @param string           $tagName
-     * @param ContainerBuilder $container
+     * @param string $tagName
     *
     * @return array
     */

diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -42,7 +42,6 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface
     * mapper implementations.
     *
     * @param ChoiceListFactoryInterface $factory      The factory for creating the loaded choice list
-     * @param ObjectManager              $manager      The object manager
     * @param string                     $class        The class name of the loaded objects
     * @param IdReader                   $idReader     The reader for the object IDs
     * @param null|EntityLoaderInterface $objectLoader The objects loader

diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
@@ -303,8 +303,6 @@ public function getValuesForChoices(array $entities)
    /**
     * Returns the indices corresponding to the given entities.
     *
-     * @param array $entities
-     *
     * @return array
     *
     * @see ChoiceListInterface
@@ -346,8 +344,6 @@ public function getIndicesForChoices(array $entities)
    /**
     * Returns the entities corresponding to the given values.
     *
-     * @param array $values
-     *
     * @return array
     *
     * @see ChoiceListInterface

diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -327,9 +327,8 @@ public function configureOptions(OptionsResolver $resolver)
    /**
     * Return the default loader object.
     *
-     * @param ObjectManager $manager
-     * @param mixed         $queryBuilder
-     * @param string        $class
+     * @param mixed  $queryBuilder
+     * @param string $class
     *
     * @return EntityLoaderInterface
     */

diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php b/src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
@@ -46,9 +46,8 @@ public function configureOptions(OptionsResolver $resolver)
    /**
     * Return the default loader object.
     *
-     * @param ObjectManager $manager
-     * @param QueryBuilder  $queryBuilder
-     * @param string        $class
+     * @param QueryBuilder $queryBuilder
+     * @param string       $class
     *
     * @return ORMQueryBuilderLoader
     */

diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
@@ -54,8 +54,7 @@ class DbalSessionHandler implements \SessionHandlerInterface
    private $timeCol = 'sess_time';

    /**
-     * @param Connection $con       A connection
-     * @param string     $tableName Table name
+     * @param string $tableName Table name
     */
    public function __construct(Connection $con, $tableName = 'sessions')
    {

diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -187,7 +187,6 @@ public function providerBasicDrivers()

    /**
     * @param string $class
-     * @param array  $config
     *
     * @dataProvider providerBasicDrivers
     */

diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -33,8 +33,7 @@ public function __construct(ManagerRegistry $registry)
    }

    /**
-     * @param object     $entity
-     * @param Constraint $constraint
+     * @param object $entity
     *
     * @throws UnexpectedTypeException
     * @throws ConstraintDefinitionException

diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -38,8 +38,7 @@ protected function setUp()
    /**
     * @dataProvider getProxyCandidates
     *
-     * @param Definition $definition
-     * @param bool       $expected
+     * @param bool $expected
     */
    public function testIsProxyCandidate(Definition $definition, $expected)
    {

diff --git a/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php b/src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
@@ -34,8 +34,7 @@ class MessageDataCollector extends DataCollector
     * We don't inject the message logger and mailer here
     * to avoid the creation of these objects when no emails are sent.
     *
-     * @param ContainerInterface $container A ContainerInterface instance
-     * @param bool               $isSpool
+     * @param bool $isSpool
     */
    public function __construct(ContainerInterface $container, $isSpool)
    {

diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -104,8 +104,7 @@ public function getPriority()
    }

    /**
-     * @param Node $arguments
-     * @param int  $index
+     * @param int $index
     *
     * @return string|null
     */

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
@@ -29,9 +29,7 @@ class TemplateFinder implements TemplateFinderInterface
    private $templates;

    /**
-     * @param KernelInterface             $kernel  A KernelInterface instance
-     * @param TemplateNameParserInterface $parser  A TemplateNameParserInterface instance
-     * @param string                      $rootDir The directory where global templates can be stored
+     * @param string $rootDir The directory where global templates can be stored
     */
    public function __construct(KernelInterface $kernel, TemplateNameParserInterface $parser, $rootDir)
    {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -173,10 +173,9 @@ protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = tr
    }

    /**
-     * @param KernelInterface $parent
-     * @param string          $namespace
-     * @param string          $parentClass
-     * @param string          $warmupDir
+     * @param string $namespace
+     * @param string $parentClass
+     * @param string $warmupDir
     *
     * @return KernelInterface
     */

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php
@@ -171,9 +171,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
     * Determine the absolute file path for the router script, using the environment to choose a standard script
     * if no custom router script is specified.
     *
-     * @param string|null     $router File path of the custom router script, if set by the user; otherwise null
-     * @param string          $env    The application environment
-     * @param OutputInterface $output An OutputInterface instance
+     * @param string|null $router File path of the custom router script, if set by the user; otherwise null
+     * @param string      $env    The application environment
     *
     * @return string|bool The absolute file path of the router script, or false on failure
     */
@@ -199,10 +198,9 @@ private function determineRouterScript($router, $env, OutputInterface $output)
    /**
     * Creates a process to start PHP's built-in web server.
     *
-     * @param OutputInterface $output       A OutputInterface instance
-     * @param string          $address      IP address and port to listen to
-     * @param string          $documentRoot The application's document root
-     * @param string          $router       The router filename
+     * @param string $address      IP address and port to listen to
+     * @param string $documentRoot The application's document root
+     * @param string $router       The router filename
     *
     * @return Process The process
     */

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -104,8 +104,7 @@ protected function write($content, $decorated = false)
    /**
     * Writes content to output.
     *
-     * @param Table $table
-     * @param bool  $decorated
+     * @param bool $decorated
     */
    protected function renderTable(Table $table, $decorated = false)
    {
@@ -145,7 +144,6 @@ abstract protected function describeContainerTags(ContainerBuilder $builder, arr
     * * name: name of described service
     *
     * @param Definition|Alias|object $service
-     * @param array                   $options
     */
    abstract protected function describeContainerService($service, array $options = array());

@@ -184,7 +182,6 @@ abstract protected function describeEventDispatcherListeners(EventDispatcherInte
     * Describes a callable.
     *
     * @param callable $callable
-     * @param array    $options
     */
    abstract protected function describeCallable($callable, array $options = array());

@@ -231,8 +228,7 @@ protected function formatParameter($value)
    }

    /**
-     * @param ContainerBuilder $builder
-     * @param string           $serviceId
+     * @param string $serviceId
     *
     * @return mixed
     */
@@ -256,8 +252,7 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
    }

    /**
-     * @param ContainerBuilder $builder
-     * @param bool             $showPrivate
+     * @param bool $showPrivate
     *
     * @return array
     */

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -199,8 +199,7 @@ protected function getRouteData(Route $route)
    }

    /**
-     * @param Definition $definition
-     * @param bool       $omitTags
+     * @param bool $omitTags
     *
     * @return array
     */
@@ -274,8 +273,7 @@ private function getContainerAliasData(Alias $alias)
    }

    /**
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param string|null              $event
+     * @param string|null $event
     *
     * @return array
     */
@@ -303,7 +301,6 @@ private function getEventDispatcherListenersData(EventDispatcherInterface $event

    /**
     * @param callable $callable
-     * @param array    $options
     *
     * @return array
     */

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -435,7 +435,6 @@ private function formatCallable($callable)

    /**
     * @param string $content
-     * @param array  $options
     */
    private function writeText($content, array $options = array())
    {