symfony · nicolas-grekas · Aug 21, 2019 · Aug 13, 2019
diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
@@ -133,7 +133,7 @@ public function format(array $record)
     /**
      * @internal
      */
-    public function echoLine($line, $depth, $indentPad)
+    public function echoLine(string $line, int $depth, string $indentPad)
     {
         if (-1 !== $depth) {
             fwrite($this->outputBuffer, $line);
@@ -143,7 +143,7 @@ public function echoLine($line, $depth, $indentPad)
     /**
      * @internal
      */
-    public function castObject($v, array $a, Stub $s, $isNested)
+    public function castObject($v, array $a, Stub $s, bool $isNested)
     {
         if ($this->options['multiline']) {
             return $a;

diff --git a/src/Symfony/Component/BrowserKit/CookieJar.php b/src/Symfony/Component/BrowserKit/CookieJar.php
@@ -106,9 +106,8 @@ public function clear()
      * Updates the cookie jar from a response Set-Cookie headers.
      *
      * @param string[] $setCookies Set-Cookie headers from an HTTP response
-     * @param string   $uri        The base URL
      */
-    public function updateFromSetCookie(array $setCookies, $uri = null)
+    public function updateFromSetCookie(array $setCookies, string $uri = null)
     {
         $cookies = [];
 
@@ -133,8 +132,6 @@ public function updateFromSetCookie(array $setCookies, $uri = null)
 
     /**
      * Updates the cookie jar from a Response object.
-     *
-     * @param string $uri The base URL
      */
     public function updateFromResponse(Response $response, string $uri = null)
     {

diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php
@@ -332,11 +332,9 @@ protected function normalizeValue($value)
     /**
      * Remaps multiple singular values to a single plural value.
      *
-     * @param array $value The source values
-     *
      * @return array The remapped values
      */
-    protected function remapXml($value)
+    protected function remapXml(array $value)
     {
         foreach ($this->xmlRemappings as list($singular, $plural)) {
             if (!isset($value[$singular])) {

diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
@@ -31,7 +31,7 @@ public function dump(ConfigurationInterface $configuration, string $namespace =
         return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree(), $namespace);
     }
 
-    public function dumpNode(NodeInterface $node, $namespace = null)
+    public function dumpNode(NodeInterface $node, string $namespace = null)
     {
         $this->reference = '';
         $this->writeNode($node, 0, true, $namespace);

diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -33,7 +33,7 @@ public function dump(ConfigurationInterface $configuration)
         return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree());
     }
 
-    public function dumpAtPath(ConfigurationInterface $configuration, $path)
+    public function dumpAtPath(ConfigurationInterface $configuration, string $path)
     {
         $rootNode = $node = $configuration->getConfigTreeBuilder()->buildTree();
 

diff --git a/src/Symfony/Component/Config/Definition/Exception/InvalidConfigurationException.php b/src/Symfony/Component/Config/Definition/Exception/InvalidConfigurationException.php
@@ -34,10 +34,8 @@ public function getPath()
 
     /**
      * Adds extra information that is suffixed to the original exception message.
-     *
-     * @param string $hint
      */
-    public function addHint($hint)
+    public function addHint(string $hint)
     {
         if (!$this->containsHints) {
             $this->message .= "\nHint: ".$hint;

diff --git a/src/Symfony/Component/Config/FileLocator.php b/src/Symfony/Component/Config/FileLocator.php
@@ -35,7 +35,7 @@ public function __construct($paths = [])
      */
     public function locate(string $name, string $currentPath = null, bool $first = true)
     {
-        if ('' == $name) {
+        if ('' === $name) {
             throw new \InvalidArgumentException('An empty file name is not valid to be located.');
         }
 

diff --git a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
@@ -128,7 +128,7 @@ public function __sleep(): array
      *
      * @internal
      */
-    public static function throwOnRequiredClass($class, \Exception $previous = null)
+    public static function throwOnRequiredClass(string $class, \Exception $previous = null)
     {
         // If the passed class is the resource being checked, we shouldn't throw.
         if (null === $previous && self::$autoloadedClass === $class) {

diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -247,7 +247,7 @@ public static function phpize($value)
         }
     }
 
-    protected static function getXmlErrors($internalErrors)
+    protected static function getXmlErrors(bool $internalErrors)
     {
         $errors = [];
         foreach (libxml_get_errors() as $error) {

diff --git a/src/Symfony/Component/Console/Question/ChoiceQuestion.php b/src/Symfony/Component/Console/Question/ChoiceQuestion.php
@@ -58,11 +58,9 @@ public function getChoices()
      *
      * When multiselect is set to true, multiple choices can be answered.
      *
-     * @param bool $multiselect
-     *
      * @return $this
      */
-    public function setMultiselect($multiselect)
+    public function setMultiselect(bool $multiselect)
     {
         $this->multiselect = $multiselect;
         $this->setValidator($this->getDefaultValidator());
@@ -93,11 +91,9 @@ public function getPrompt()
     /**
      * Sets the prompt for choices.
      *
-     * @param string $prompt
-     *
      * @return $this
      */
-    public function setPrompt($prompt)
+    public function setPrompt(string $prompt)
     {
         $this->prompt = $prompt;
 
@@ -109,11 +105,9 @@ public function setPrompt($prompt)
      *
      * The error message has a string placeholder (%s) for the invalid value.
      *
-     * @param string $errorMessage
-     *
      * @return $this
      */
-    public function setErrorMessage($errorMessage)
+    public function setErrorMessage(string $errorMessage)
     {
         $this->errorMessage = $errorMessage;
         $this->setValidator($this->getDefaultValidator());

diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
@@ -130,14 +130,11 @@ public function getAutocompleterValues()
     /**
      * Sets values for the autocompleter.
      *
-     * @param iterable|null $values
-     *
      * @return $this
      *
-     * @throws InvalidArgumentException
      * @throws LogicException
      */
-    public function setAutocompleterValues($values)
+    public function setAutocompleterValues(?iterable $values)
     {
         if (\is_array($values)) {
             $values = $this->isAssoc($values) ? array_merge(array_keys($values), array_values($values)) : array_values($values);
@@ -150,10 +147,8 @@ public function setAutocompleterValues($values)
             $callback = static function () use ($values, &$valueCache) {
                 return $valueCache ?? $valueCache = iterator_to_array($values, false);
             };
-        } elseif (null === $values) {
-            $callback = null;
         } else {
-            throw new InvalidArgumentException('Autocompleter values can be either an array, "null" or a "Traversable" object.');
+            $callback = null;
         }
 
         return $this->setAutocompleterCallback($callback);
@@ -212,13 +207,11 @@ public function getValidator()
      *
      * Null means an unlimited number of attempts.
      *
-     * @param int|null $attempts
-     *
      * @return $this
      *
      * @throws InvalidArgumentException in case the number of attempts is invalid
      */
-    public function setMaxAttempts($attempts)
+    public function setMaxAttempts(?int $attempts)
     {
         if (null !== $attempts && $attempts < 1) {
             throw new InvalidArgumentException('Maximum number of attempts must be a positive value.');
@@ -267,7 +260,7 @@ public function getNormalizer()
         return $this->normalizer;
     }
 
-    protected function isAssoc($array)
+    protected function isAssoc(array $array)
     {
         return (bool) \count(array_filter(array_keys($array), 'is_string'));
     }

diff --git a/src/Symfony/Component/Console/Tests/Question/QuestionTest.php b/src/Symfony/Component/Console/Tests/Question/QuestionTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Console\Tests\Question;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Question\Question;
 
 class QuestionTest extends TestCase
@@ -150,10 +149,7 @@ public function providerSetAutocompleterValuesInvalid()
      */
     public function testSetAutocompleterValuesInvalid($values)
     {
-        self::expectException(InvalidArgumentException::class);
-        self::expectExceptionMessage(
-            'Autocompleter values can be either an array, "null" or a "Traversable" object.'
-        );
+        self::expectException(\TypeError::class);
 
         $this->question->setAutocompleterValues($values);
     }
@@ -271,7 +267,7 @@ public function testGetSetMaxAttempts($attempts)
 
     public function providerSetMaxAttemptsInvalid()
     {
-        return [['Potato'], [0], [-1]];
+        return [[0], [-1]];
     }
 
     /**

diff --git a/src/Symfony/Component/EventDispatcher/GenericEvent.php b/src/Symfony/Component/EventDispatcher/GenericEvent.php
@@ -50,13 +50,11 @@ public function getSubject()
     /**
      * Get argument by key.
      *
-     * @param string $key Key
-     *
      * @return mixed Contents of array key
      *
      * @throws \InvalidArgumentException if key is not found
      */
-    public function getArgument($key)
+    public function getArgument(string $key)
     {
         if ($this->hasArgument($key)) {
             return $this->arguments[$key];
@@ -68,12 +66,11 @@ public function getArgument($key)
     /**
      * Add argument to event.
      *
-     * @param string $key   Argument name
-     * @param mixed  $value Value
+     * @param mixed $value Value
      *
      * @return $this
      */
-    public function setArgument($key, $value)
+    public function setArgument(string $key, $value)
     {
         $this->arguments[$key] = $value;
 
@@ -93,8 +90,6 @@ public function getArguments()
     /**
      * Set args property.
      *
-     * @param array $args Arguments
-     *
      * @return $this
      */
     public function setArguments(array $args = [])
@@ -107,11 +102,9 @@ public function setArguments(array $args = [])
     /**
      * Has argument.
      *
-     * @param string $key Key of arguments array
-     *
      * @return bool
      */
-    public function hasArgument($key)
+    public function hasArgument(string $key)
     {
         return \array_key_exists($key, $this->arguments);
     }

diff --git a/...ny/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/...ny/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -158,7 +158,7 @@ public function reverseTransform($value)
      *
      * @throws TransformationFailedException in case the date formatter can not be constructed
      */
-    protected function getIntlDateFormatter($ignoreTimezone = false)
+    protected function getIntlDateFormatter(bool $ignoreTimezone = false)
     {
         $dateFormat = $this->dateFormat;
         $timeFormat = $this->timeFormat;

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
@@ -87,7 +87,7 @@ public function getBlockPrefix()
      * The pattern contains the placeholder "{{ widget }}" where the HTML tag should
      * be inserted
      */
-    protected static function getPattern($currency)
+    protected static function getPattern(?string $currency)
     {
         if (!$currency) {
             return '{{ widget }}';

diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -83,7 +83,7 @@ public static function create($data = null, int $status = 200, array $headers =
      *
      * @return static
      */
-    public static function fromJsonString($data = null, int $status = 200, array $headers = [])
+    public static function fromJsonString(string $data = null, int $status = 200, array $headers = [])
     {
         return new static($data, $status, $headers, true);
     }

diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
@@ -153,7 +153,7 @@ public function execute()
      *
      * @internal
      */
-    public function getResource($idx = 0)
+    public function getResource(int $idx = 0)
     {
         if (null === $this->results || $idx >= \count($this->results)) {
             return null;

diff --git a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php
@@ -146,7 +146,7 @@ public function supportsClass(string $class)
      *
      * @return LdapUser
      */
-    protected function loadUser($username, Entry $entry)
+    protected function loadUser(string $username, Entry $entry)
     {
         $password = null;
         $extraFields = [];

diff --git a/src/Symfony/Component/Lock/Key.php b/src/Symfony/Component/Lock/Key.php
@@ -60,7 +60,7 @@ public function resetLifetime()
     /**
      * @param float $ttl the expiration delay of locks in seconds
      */
-    public function reduceLifetime($ttl)
+    public function reduceLifetime(float $ttl)
     {
         $newTime = microtime(true) + $ttl;
 

diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php
@@ -30,7 +30,7 @@ abstract class AbstractStream
 
     private $debug = '';
 
-    public function write(string $bytes, $debug = true): void
+    public function write(string $bytes, bool $debug = true): void
     {
         if ($debug) {
             foreach (explode("\n", trim($bytes)) as $line) {

diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
@@ -63,7 +63,7 @@ public function getConfiguration(): array
         return $this->configuration;
     }
 
-    public static function buildConfiguration($dsn, array $options = []): array
+    public static function buildConfiguration(string $dsn, array $options = []): array
     {
         if (false === $components = parse_url($dsn)) {
             throw new InvalidArgumentException(sprintf('The given Doctrine Messenger DSN "%s" is invalid.', $dsn));

diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php
@@ -178,7 +178,7 @@ public function stop(): void
         $this->shouldStop = true;
     }
 
-    private function dispatchEvent($event)
+    private function dispatchEvent(object $event): void
     {
         if (null === $this->eventDispatcher) {
             return;