symfony · nicolas-grekas · Nov 5, 2017 · Oct 28, 2017 · chalasr · Oct 30, 2017
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
@@ -22,11 +22,11 @@
  */
 class DoctrineValidationPass implements CompilerPassInterface
 {
-    /**
-     * @var string
-     */
     private $managerType;
 
+    /**
+     * @param string $managerType
+     */
     public function __construct($managerType)
     {
         $this->managerType = $managerType;

diff --git a/...ge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/...ge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -26,9 +26,6 @@
  */
 class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
 {
-    /**
-     * @var string|string[]
-     */
     private $connections;
     private $eventManagers;
     private $managerTemplate;

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
@@ -113,7 +113,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      *                                                      present to enable the mapping. Set to false
      *                                                      to not do any check, optional.
      * @param string               $configurationPattern    Pattern for the Configuration service name
-     * @param string               $registerAliasMethodName name of Configuration class method to
+     * @param string               $registerAliasMethodName Name of Configuration class method to
      *                                                      register alias
      * @param string[]             $aliasMap                Map of alias to namespace
      */
@@ -178,7 +178,7 @@ protected function getChainDriverServiceName(ContainerBuilder $container)
     /**
      * Create the service definition for the metadata driver.
      *
-     * @param ContainerBuilder $container passed on in case an extending class
+     * @param ContainerBuilder $container Passed on in case an extending class
      *                                    needs access to the container
      *
      * @return Definition|Reference the metadata driver to add to all chain drivers

diff --git a/src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php b/src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php
@@ -20,9 +20,6 @@
  */
 class DoctrineParserCache implements ParserCacheInterface
 {
-    /**
-     * @var Cache
-     */
     private $cache;
 
     public function __construct(Cache $cache)

diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -23,29 +23,10 @@
  */
 class DoctrineChoiceLoader implements ChoiceLoaderInterface
 {
-    /**
-     * @var ChoiceListFactoryInterface
-     */
     private $factory;
-
-    /**
-     * @var ObjectManager
-     */
     private $manager;
-
-    /**
-     * @var string
-     */
     private $class;
-
-    /**
-     * @var IdReader
-     */
     private $idReader;
-
-    /**
-     * @var null|EntityLoaderInterface
-     */
     private $objectLoader;
 
     /**
@@ -60,13 +41,10 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface
      * passed which optimizes the object loading for one of the Doctrine
      * mapper implementations.
      *
-     * @param ChoiceListFactoryInterface $factory      The factory for creating
-     *                                                 the loaded choice list
+     * @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 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
      */
     public function __construct(ChoiceListFactoryInterface $factory, ObjectManager $manager, $class, IdReader $idReader = null, EntityLoaderInterface $objectLoader = null)

diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php
@@ -24,29 +24,10 @@
  */
 class IdReader
 {
-    /**
-     * @var ObjectManager
-     */
     private $om;
-
-    /**
-     * @var ClassMetadata
-     */
     private $classMetadata;
-
-    /**
-     * @var bool
-     */
     private $singleId;
-
-    /**
-     * @var bool
-     */
     private $intId;
-
-    /**
-     * @var string
-     */
     private $idField;
 
     /**

diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php
@@ -25,14 +25,7 @@ class DoctrineOrmExtension extends AbstractExtension
 {
     protected $registry;
 
-    /**
-     * @var PropertyAccessorInterface
-     */
     private $propertyAccessor;
-
-    /**
-     * @var ChoiceListFactoryInterface
-     */
     private $choiceListFactory;
 
     public function __construct(ManagerRegistry $registry, PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null)

diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -25,9 +25,6 @@
  */
 class UniqueEntityValidator extends ConstraintValidator
 {
-    /**
-     * @var ManagerRegistry
-     */
     private $registry;
 
     public function __construct(ManagerRegistry $registry)

diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -25,19 +25,8 @@
  */
 class ProxyDumper implements DumperInterface
 {
-    /**
-     * @var string
-     */
     private $salt;
-
-    /**
-     * @var LazyLoadingValueHolderGenerator
-     */
     private $proxyGenerator;
-
-    /**
-     * @var BaseGeneratorStrategy
-     */
     private $classGenerator;
 
     /**

diff --git a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php
@@ -23,10 +23,6 @@
 class StopwatchExtension extends AbstractExtension
 {
     private $stopwatch;
-
-    /**
-     * @var bool
-     */
     private $enabled;
 
     public function __construct(Stopwatch $stopwatch = null, $enabled = true)

diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -30,9 +30,6 @@
  */
 class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor
 {
-    /**
-     * @var Scope
-     */
     private $scope;
 
     public function __construct()

diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
@@ -42,11 +42,6 @@ class TwigExtractor extends AbstractFileExtractor implements ExtractorInterface
      */
     private $prefix = '';
 
-    /**
-     * The twig environment.
-     *
-     * @var Environment
-     */
     private $twig;
 
     public function __construct(Environment $twig)

diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
@@ -21,9 +21,6 @@
  */
 class SessionListener extends BaseSessionListener
 {
-    /**
-     * @var ContainerInterface
-     */
     private $container;
 
     public function __construct(ContainerInterface $container)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php b/src/Symfony/Bundle/FrameworkBundle/Translation/TranslationLoader.php
@@ -43,8 +43,8 @@ public function addLoader($format, LoaderInterface $loader)
     /**
      * Loads translation messages from a directory to the catalogue.
      *
-     * @param string           $directory the directory to look into
-     * @param MessageCatalogue $catalogue the catalogue
+     * @param string           $directory The directory to look into
+     * @param MessageCatalogue $catalogue The catalogue
      */
     public function loadMessages($directory, MessageCatalogue $catalogue)
     {

diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
@@ -31,12 +31,12 @@
 class ExceptionController
 {
     protected $twig;
+    protected $debug;
 
     /**
-     * @var bool Show error (false) or exception (true) pages by default
+     * @param Environment $twig
+     * @param bool        $debug Show error (false) or exception (true) pages by default
      */
-    protected $debug;
-
     public function __construct(Environment $twig, $debug)
     {
         $this->twig = $twig;

diff --git a/src/Symfony/Component/ClassLoader/XcacheClassLoader.php b/src/Symfony/Component/ClassLoader/XcacheClassLoader.php
@@ -49,12 +49,6 @@
 class XcacheClassLoader
 {
     private $prefix;
-
-    /**
-     * A class loader object that implements the findFile() method.
-     *
-     * @var object
-     */
     private $decorated;
 
     /**

diff --git a/src/Symfony/Component/Config/ConfigCacheFactory.php b/src/Symfony/Component/Config/ConfigCacheFactory.php
@@ -19,9 +19,6 @@
  */
 class ConfigCacheFactory implements ConfigCacheFactoryInterface
 {
-    /**
-     * @var bool Debug flag passed to the ConfigCache
-     */
     private $debug;
 
     /**

diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
@@ -81,7 +81,7 @@ public function getChildren()
     /**
      * Sets the xml remappings that should be performed.
      *
-     * @param array $remappings an array of the form array(array(string, string))
+     * @param array $remappings An array of the form array(array(string, string))
      */
     public function setXmlRemappings(array $remappings)
     {

diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
@@ -67,7 +67,7 @@ public function children()
     /**
      * Sets a prototype for child nodes.
      *
-     * @param string $type the type of node
+     * @param string $type The type of node
      *
      * @return NodeDefinition
      */
@@ -97,7 +97,7 @@ public function addDefaultsIfNotSet()
      *
      * This method is applicable to prototype nodes only.
      *
-     * @param int|string|array|null $children the number of children|The child name|The children names to be added
+     * @param int|string|array|null $children The number of children|The child name|The children names to be added
      *
      * @return $this
      */

diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
@@ -61,7 +61,7 @@ public function arrayNode($name)
     /**
      * Creates a child scalar node.
      *
-     * @param string $name the name of the node
+     * @param string $name The name of the node
      *
      * @return ScalarNodeDefinition The child node
      */
@@ -85,7 +85,7 @@ public function booleanNode($name)
     /**
      * Creates a child integer node.
      *
-     * @param string $name the name of the node
+     * @param string $name The name of the node
      *
      * @return IntegerNodeDefinition The child node
      */
@@ -97,7 +97,7 @@ public function integerNode($name)
     /**
      * Creates a child float node.
      *
-     * @param string $name the name of the node
+     * @param string $name The name of the node
      *
      * @return FloatNodeDefinition The child node
      */

diff --git a/src/Symfony/Component/Console/ConsoleEvents.php b/src/Symfony/Component/Console/ConsoleEvents.php
@@ -27,8 +27,6 @@ final class ConsoleEvents
      * instance.
      *
      * @Event
-     *
-     * @var string
      */
     const COMMAND = 'console.command';
 
@@ -40,8 +38,6 @@ final class ConsoleEvents
      * instance.
      *
      * @Event
-     *
-     * @var string
      */
     const TERMINATE = 'console.terminate';
 
@@ -54,8 +50,6 @@ final class ConsoleEvents
      * instance.
      *
      * @Event
-     *
-     * @var string
      */
     const EXCEPTION = 'console.exception';
 }
diff --git a/src/Symfony/Component/Console/Event/ConsoleCommandEvent.php b/src/Symfony/Component/Console/Event/ConsoleCommandEvent.php
@@ -25,8 +25,6 @@ class ConsoleCommandEvent extends ConsoleEvent
 
     /**
      * Indicates if the command should be run or skipped.
-     *
-     * @var bool
      */
     private $commandShouldRun = true;
 

diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -22,18 +22,13 @@
  */
 class ProgressBar
 {
-    // options
     private $barWidth = 28;
     private $barChar;
     private $emptyBarChar = '-';
     private $progressChar = '>';
     private $format;
     private $internalFormat;
     private $redrawFreq = 1;
-
-    /**
-     * @var OutputInterface
-     */
     private $output;
     private $step = 0;
     private $max;

diff --git a/src/Symfony/Component/Console/Helper/TableHelper.php b/src/Symfony/Component/Console/Helper/TableHelper.php
@@ -29,9 +29,6 @@ class TableHelper extends Helper
     const LAYOUT_BORDERLESS = 1;
     const LAYOUT_COMPACT = 2;
 
-    /**
-     * @var Table
-     */
     private $table;
 
     public function __construct($triggerDeprecationError = true)

diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -307,7 +307,7 @@ public function hasShortcut($name)
     /**
      * Gets an InputOption by shortcut.
      *
-     * @param string $shortcut the Shortcut name
+     * @param string $shortcut The Shortcut name
      *
      * @return InputOption An InputOption object
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,9 +19,6 @@ @@
      */
     class ConfigCacheFactory implements ConfigCacheFactoryInterface
     {
-        /**
-         * @var bool Debug flag passed to the ConfigCache
-         */
         private $debug;
         /**
@@ Expand Down @@