symfony · nicolas-grekas · Nov 7, 2017 · Oct 28, 2017 · tomasfejfar · Nov 7, 2017
diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -165,12 +165,8 @@ private function sanitizeQuery($connectionName, $query)
      * The return value is an array with the sanitized value and a boolean
      * indicating if the original value was kept (allowing to use the sanitized
      * value to explain the query).
-     *
-     * @param mixed $var
-     *
-     * @return array
      */
-    private function sanitizeParam($var)
+    private function sanitizeParam($var): array
     {
         if (is_object($var)) {
             $className = get_class($var);

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
@@ -23,10 +23,7 @@ class DoctrineValidationPass implements CompilerPassInterface
 {
     private $managerType;
 
-    /**
-     * @param string $managerType
-     */
-    public function __construct($managerType)
+    public function __construct(string $managerType)
     {
         $this->managerType = $managerType;
     }
@@ -43,12 +40,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
      */
-    private function updateValidatorMappingFiles(ContainerBuilder $container, $mapping, $extension)
+    private function updateValidatorMappingFiles(ContainerBuilder $container, string $mapping, string $extension)
     {
         if (!$container->hasParameter('validator.mapping.loader.'.$mapping.'_files_loader.mapping_files')) {
             return;

diff --git a/...ge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/...ge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -37,7 +37,7 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
      *                                manager's service ID for a connection name
      * @param string $tagPrefix       Tag prefix for listeners and subscribers
      */
-    public function __construct($connections, $managerTemplate, $tagPrefix)
+    public function __construct(string $connections, string $managerTemplate, string $tagPrefix)
     {
         $this->connections = $connections;
         $this->managerTemplate = $managerTemplate;

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
@@ -117,7 +117,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      *                                                      register alias
      * @param string[]             $aliasMap                Map of alias to namespace
      */
-    public function __construct($driver, array $namespaces, array $managerParameters, $driverPattern, $enabledParameter = false, $configurationPattern = '', $registerAliasMethodName = '', array $aliasMap = array())
+    public function __construct($driver, array $namespaces, array $managerParameters, string $driverPattern, $enabledParameter = false, string $configurationPattern = '', string $registerAliasMethodName = '', array $aliasMap = array())
     {
         $this->driver = $driver;
         $this->namespaces = $namespaces;

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
@@ -27,7 +27,7 @@ class EntityFactory implements UserProviderFactoryInterface
     private $key;
     private $providerId;
 
-    public function __construct($key, $providerId)
+    public function __c
8000
onstruct(string $key, string $providerId)
     {
         $this->key = $key;
         $this->providerId = $providerId;

diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -14,7 +14,6 @@
 use Doctrine\Common\Persistence\ObjectManager;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
-use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 
 /**
@@ -45,9 +44,8 @@ class DoctrineChoiceLoader implements ChoiceLoaderInterface
      * @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
-     * @param ChoiceListFactoryInterface $factory      The factory for creating the loaded choice list
      */
-    public function __construct(ObjectManager $manager, $class, $idReader = null, $objectLoader = null, $factory = null)
+    public function __construct(ObjectManager $manager, string $class, IdReader $idReader = null, EntityLoaderInterface $objectLoader = null)
     {
         $classMetadata = $manager->getClassMetadata($class);
 

diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -157,13 +157,9 @@ public function getTypes($class, $property, array $context = array())
     /**
      * 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
      */
-    private function isAssociationNullable(array $associationMapping)
+    private function isAssociationNullable(array $associationMapping): bool
     {
         if (isset($associationMapping['id']) && $associationMapping['id']) {
             return false;
@@ -185,12 +181,8 @@ private function isAssociationNullable(array $associationMapping)
 
     /**
      * Gets the corresponding built-in PHP type.
-     *
-     * @param string $doctrineType
-     *
-     * @return string|null
      */
-    private function getPhpType($doctrineType)
+    private function getPhpType(string $doctrineType): ?string
     {
         switch ($doctrineType) {
             case DBALType::SMALLINT:
@@ -217,5 +209,7 @@ private function getPhpType($doctrineType)
             case DBALType::OBJECT:
                 return Type::BUILTIN_TYPE_OBJECT;
         }
+
+        return null;
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
@@ -33,7 +33,7 @@ class EntityUserProvider implements UserProviderInterface
     private $class;
     private $property;
 
-    public function __construct(ManagerRegistry $registry, $classOrAlias, $property = null, $managerName = null)
+    public function __construct(ManagerRegistry $registry, string $classOrAlias, string $property = null, string $managerName = null)
     {
         $this->registry = $registry;
         $this->managerName = $managerName;

diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -187,12 +187,9 @@ public function providerBasicDrivers()
     }
 
     /**
-     * @param string $class
-     * @param array  $config
-     *
      * @dataProvider providerBasicDrivers
      */
-    public function testLoadBasicCacheDriver($class, array $config, array $expectedCalls = array())
+    public function testLoadBasicCacheDriver(string $class, array $config, array $expectedCalls = array())
     {
         $container = $this->createContainer();
         $cacheName = 'metadata_cache';

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/Type/StringWrapper.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/Type/StringWrapper.php
@@ -15,10 +15,7 @@ class StringWrapper
 {
     private $string;
 
-    /**
-     * @param string $string
-     */
-    public function __construct($string = null)
+    public function __construct(string $string = null)
     {
         $this->string = $string;
     }

diff --git a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
@@ -58,7 +58,7 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe
      * @param array                $verbosityLevelMap Array that maps the OutputInterface verbosity to a minimum logging
      *                                                level (leave empty to use the default mapping)
      */
-    public function __construct(OutputInterface $output = null, $bubble = true, array $verbosityLevelMap = array())
+    public function __construct(OutputInterface $output = null, bool $bubble = true, array $verbosityLevelMap = array())
     {
         parent::__construct(Logger::DEBUG, $bubble);
         $this->output = $output;

diff --git a/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php b/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php
@@ -24,7 +24,7 @@ class ServerLogHandler extends AbstractHandler
     private $context;
     private $socket;
 
-    public function __construct($host, $level = Logger::DEBUG, $bubble = true, $context = array())
+    public function __construct(string $host, int $level = Logger::DEBUG, bool $bubble = true, array $context = array())
     {
         parent::__construct($level, $bubble);
 

diff --git a/src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php b/src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php
@@ -68,10 +68,7 @@ public function testCanBeConstructedWithExtraFields()
         $this->assertEquals($server['HTTP_REFERER'], $record['extra']['referrer']);
     }
 
-    /**
-     * @return array
-     */
-    private function createRequestEvent($additionalServerParameters = array())
+    private function createRequestEvent($additionalServerParameters = array()): array
     {
         $server = array_merge(
             array(
@@ -101,13 +98,7 @@ private function createRequestEvent($additionalServerParameters = array())
         return array($event, $server);
     }
 
-    /**
-     * @param int    $level
-     * @param string $message
-     *
-     * @return array Record
-     */
-    private function getRecord($level = Logger::WARNING, $message = 'test')
+    private function getRecord(int $level = Logger::WARNING, string $message = 'test'): array
     {
         return array(
             'message' => $message,

diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -30,10 +30,7 @@ class ProxyDumper implements DumperInterface
     private $proxyGenerator;
     private $classGenerator;
 
-    /**
-     * @param string $salt
-     */
-    public function __construct($salt = '')
+    public function __construct(string $salt = '')
     {
         $this->salt = $salt;
         $this->proxyGenerator = new LazyLoadingValueHolderGenerator();

diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -37,11 +37,8 @@ protected function setUp()
 
     /**
      * @dataProvider getProxyCandidates
-     *
-     * @param Definition $definition
-     * @param bool       $expected
      */
-    public function testIsProxyCandidate(Definition $definition, $expected)
+    public function testIsProxyCandidate(Definition $definition, bool $expected)
     {
         $this->assertSame($expected, $this->dumper->isProxyCandidate($definition));
     }

diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -32,7 +32,7 @@ class DebugCommand extends Command
     private $twig;
     private $projectDir;
 
-    public function __construct(Environment $twig, $projectDir = null)
+    public function __construct(Environment $twig, string $projectDir = null)
     {
         parent::__construct();
 

diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
@@ -31,7 +31,7 @@ class CodeExtension extends AbstractExtension
      * @param string                   $rootDir        The project root directory
      * @param string                   $charset        The charset
      */
-    public function __construct($fileLinkFormat, $rootDir, $charset)
+    public function __construct($fileLinkFormat, string $rootDir, string $charset)
     {
         $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
         $this->rootDir = str_replace('/', DIRECTORY_SEPARATOR, dirname($rootDir)).DIRECTORY_SEPARATOR;

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

diff --git a/src/Symfony/Bridge/Twig/Node/DumpNode.php b/src/Symfony/Bridge/Twig/Node/DumpNode.php
@@ -21,7 +21,7 @@ class DumpNode extends Node
 {
     private $varPrefix;
 
-    public function __construct($varPrefix, Node $values = null, $lineno, $tag = null)
+    public function __construct($varPrefix, Node $values = null, int $lineno, string $tag = null)
     {
         $nodes = array();
         if (null !== $values) {

diff --git a/src/Symfony/Bridge/Twig/Node/FormThemeNode.php b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php
@@ -20,9 +20,9 @@
  */
 class FormThemeNode extends Node
 {
-    public function __construct(Node $form, Node $resources, $lineno, $tag = null, $only = false)
+    public function __construct(Node $form, Node $resources, int $lineno, string $tag = null, bool $only = false)
     {
-        parent::__construct(array('form' => $form, 'resources' => $resources), array('only' => (bool) $only), $lineno, $tag);
+        parent::__construct(array('form' => $form, 'resources' => $resources), array('only' => $only), $lineno, $tag);
     }
 
     public function compile(Compiler $compiler)

diff --git a/src/Symfony/Bridge/Twig/Node/StopwatchNode.php b/src/Symfony/Bridge/Twig/Node/StopwatchNode.php
@@ -22,7 +22,7 @@
  */
 class StopwatchNode extends Node
 {
-    public function __construct(Node $name, Node $body, AssignNameExpression $var, $lineno = 0, $tag = null)
+    public function __construct(Node $name, Node $body, AssignNameExpression $var, int $lineno = 0, string $tag = null)
     {
         parent::__construct(array('body' => $body, 'name' => $name, 'var' => $var), array(), $lineno, $tag);
     }

diff --git a/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php b/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php
@@ -20,7 +20,7 @@
  */
 class TransDefaultDomainNode extends Node
 {
-    public function __construct(AbstractExpression $expr, $lineno = 0, $tag = null)
+    public function __construct(AbstractExpression $expr, int $lineno = 0, string $tag = null)
     {
         parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
     }

diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php
@@ -27,7 +27,7 @@ class_exists('Twig\Node\Expression\ArrayExpression');
  */
 class TransNode extends Node
 {
-    public function __construct(Node $body, Node $domain = null, AbstractExpression $count = null, AbstractExpression $vars = null, AbstractExpression $locale = null, $lineno = 0, $tag = null)
+    public function __construct(Node $body, Node $domain = null, AbstractExpression $count = null, AbstractExpression $vars = null, AbstractExpression $locale = null, int $lineno = 0, string $tag = null)
     {
         $nodes = array('body' => $body);
         if (null !== $domain) {

diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -103,29 +103,20 @@ public function getPriority()
         return 0;
     }
 
-    /**
-     * @param Node $arguments
-     * @param int  $index
-     *
-     * @return string|null
-     */
-    private function getReadDomainFromArguments(Node $arguments, $index)
+    private function getReadDomainFromArguments(Node $arguments, int $index): ?string
     {
         if ($arguments->hasNode('domain')) {
             $argument = $arguments->getNode('domain');
         } elseif ($arguments->hasNode($index)) {
             $argument = $arguments->getNode($index);
         } else {
-            return;
+            return null;
         }
 
         return $this->getReadDomainFromNode($argument);
     }
 
-    /**
-     * @return string|null
-     */
-    private function getReadDomainFromNode(Node $node)
+    private function getReadDomainFromNode(Node $node): ?string
     {
         if ($node instanceof ConstantExpression) {
             return $node->getAttribute('value');

diff --git a/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php
@@ -25,7 +25,7 @@ class StopwatchTokenParser extends AbstractTokenParser
 {
     protected $stopwatchIsAvailable;
 
-    public function __construct($stopwatchIsAvailable)
+    public function __construct(bool $stopwatchIsAvailable)
     {
         $this->stopwatchIsAvailable = $stopwatchIsAvailable;
     }

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
@@ -30,7 +30,7 @@ abstract class AbstractPhpFileCacheWarmer implements CacheWarmerInterface
      * @param string                 $phpArrayFile The PHP file where metadata are cached
      * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered metadata are cached
      */
-    public function __construct($phpArrayFile, CacheItemPoolInterface $fallbackPool)
+    public function __construct(string $phpArrayFile, CacheItemPoolInterface $fallbackPool)
     {
         $this->phpArrayFile = $phpArrayFile;
         if (!$fallbackPool instanceof AdapterInterface) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
@@ -33,7 +33,7 @@ class AnnotationsCacheWarmer extends AbstractPhpFileCacheWarmer
      * @param string                 $phpArrayFile     The PHP file where annotations are cached
      * @param CacheItemPoolInterface $fallbackPool     The pool where runtime-discovered annotations are cached
      */
-    public function __construct(Reader $annotationReader, $phpArrayFile, CacheItemPoolInterface $fallbackPool)
+    public function __construct(Reader $annotationReader, string $phpArrayFile, CacheItemPoolInterface $fallbackPool)
     {
         parent::__construct($phpArrayFile, $fallbackPool);
         $this->annotationReader = $annotationReader;

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
@@ -35,7 +35,7 @@ class SerializerCacheWarmer extends AbstractPhpFileCacheWarmer
      * @param string                 $phpArrayFile The PHP file where metadata are cached
      * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered metadata are cached
      */
-    public function __construct(array $loaders, $phpArrayFile, CacheItemPoolInterface $fallbackPool)
+    public function __construct(array $loaders, string $phpArrayFile, CacheItemPoolInterface $fallbackPool)
     {
         parent::__construct($phpArrayFile, $fallbackPool);
         $this->loaders = $loaders;

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
@@ -34,7 +34,7 @@ class TemplateFinder implements TemplateFinderInterface
      * @param TemplateNameParserInterface $parser  A TemplateNameParserInterface instance
      * @param string                      $rootDir The directory where global templates can be stored
      */
-    public function __construct(KernelInterface $kernel, TemplateNameParserInterface $parser, $rootDir)
+    public function __construct(KernelInterface $kernel, TemplateNameParserInterface $parser, string $rootDir)
     {
         $this->kernel = $kernel;
         $this->parser = $parser;

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -37,7 +37,7 @@ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
      * @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)
+    public function __construct(ValidatorBuilderInterface $validatorBuilder, string $phpArrayFile, CacheItemPoolInterface $fallbackPool)
     {
         parent::__construct($phpArrayFile, $fallbackPool);
         $this->validatorBuilder = $validatorBuilder;