Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit 14c45f43b6a0 · 2021-07-05T15:29:30.000+02:00
* 5.3:
  cs fix
  [DependencyInjection][Console] tighten types
  [Lock] fix derivating semaphore from key
  [Notifier] Fix TransportTestCase
  [Security\Core] Fix wrong deprecation message in UserPasswordValidator
diff --git a/src/Symfony/Component/Console/Input/InputArgument.php b/src/Symfony/Component/Console/Input/InputArgument.php
@@ -31,10 +31,10 @@ class InputArgument
     private $description;
 
     /**
-     * @param string   $name        The argument name
-     * @param int|null $mode        The argument mode: self::REQUIRED or self::OPTIONAL
-     * @param string   $description A description text
-     * @param mixed    $default     The default value (for self::OPTIONAL mode only)
+     * @param string                           $name        The argument name
+     * @param int|null                         $mode        The argument mode: self::REQUIRED or self::OPTIONAL
+     * @param string                           $description A description text
+     * @param string|bool|int|float|array|null $default     The default value (for self::OPTIONAL mode only)
      *
      * @throws InvalidArgumentException When argument mode is not valid
      */
@@ -86,7 +86,7 @@ public function isArray()
     /**
      * Sets the default value.
      *
-     * @param mixed $default The default value
+     * @param string|bool|int|float|array|null $default
      *
      * @throws LogicException When incorrect default value is given
      */
@@ -110,7 +110,7 @@ public function setDefault($default = null)
     /**
      * Returns the default value.
      *
-     * @return mixed
+     * @return string|bool|int|float|array|null
      */
     public function getDefault()
     {
diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -186,9 +186,7 @@ public function getArgumentRequiredCount()
     }
 
     /**
-     * Gets the default values.
-     *
-     * @return array An array of default values
+     * @return array<string|bool|int|float|array|null>
      */
     public function getArgumentDefaults()
     {
@@ -329,9 +327,7 @@ public function getOptionForShortcut(string $shortcut)
     }
 
     /**
-     * Gets an array of default values.
-     *
-     * @return array An array of all default values
+     * @return array<string|bool|int|float|array|null>
      */
     public function getOptionDefaults()
     {
diff --git a/src/Symfony/Component/Console/Input/InputInterface.php b/src/Symfony/Component/Console/Input/InputInterface.php
@@ -51,9 +51,9 @@ public function hasParameterOption($values, bool $onlyParams = false);
      * Does not necessarily return the correct result for short options
      * when multiple flags are combined in the same option.
      *
-     * @param string|array $values     The value(s) to look for in the raw parameters (can be an array)
-     * @param mixed        $default    The default value to return if no result is found
-     * @param bool         $onlyParams Only check real parameters, skip those following an end of options (--) signal
+     * @param string|array                     $values     The value(s) to look for in the raw parameters (can be an array)
+     * @param string|bool|int|float|array|null $default    The default value to return if no result is found
+     * @param bool                             $onlyParams Only check real parameters, skip those following an end of options (--) signal
      *
      * @return mixed The option value
      */
@@ -76,7 +76,7 @@ public function validate();
     /**
      * Returns all the given arguments merged with the default values.
      *
-     * @return array
+     * @return array<string|bool|int|float|array|null>
      */
     public function getArguments();
 
@@ -108,7 +108,7 @@ public function hasArgument(string $name);
     /**
      * Returns all the given options merged with the default values.
      *
-     * @return array
+     * @return array<string|bool|int|float|array|null>
      */
     public function getOptions();
 
diff --git a/src/Symfony/Component/Console/Input/InputOption.php b/src/Symfony/Component/Console/Input/InputOption.php
@@ -53,9 +53,9 @@ class InputOption
     private $description;
 
     /**
-     * @param string|array|null $shortcut The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
-     * @param int|null          $mode     The option mode: One of the VALUE_* constants
-     * @param mixed             $default  The default value (must be null for self::VALUE_NONE)
+     * @param string|array|null                $shortcut The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
+     * @param int|null                         $mode     The option mode: One of the VALUE_* constants
+     * @param string|bool|int|float|array|null $default  The default value (must be null for self::VALUE_NONE)
      *
      * @throws InvalidArgumentException If option mode is invalid or incompatible
      */
@@ -173,11 +173,7 @@ public function isNegatable(): bool
     }
 
     /**
-     * Sets the default value.
-     *
-     * @param mixed $default The default value
-     *
-     * @throws LogicException When incorrect default value is given
+     * @param string|bool|int|float|array|null $default
      */
     public function setDefault($default = null)
     {
@@ -199,7 +195,7 @@ public function setDefault($default = null)
     /**
      * Returns the default value.
      *
-     * @return mixed
+     * @return string|bool|int|float|array|null
      */
     public function getDefault()
     {
diff --git a/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php b/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php
@@ -24,12 +24,7 @@ class TrimmedBufferOutput extends Output
     private $maxLength;
     private $buffer = '';
 
-    public function __construct(
-        int $maxLength,
-        ?int $verbosity = self::VERBOSITY_NORMAL,
-        bool $decorated = false,
-        OutputFormatterInterface $formatter = null
-    ) {
+    public function __construct(int $maxLength, ?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null) {
         if ($maxLength <= 0) {
             throw new InvalidArgumentException(sprintf('"%s()" expects a strictly positive maxLength. Got %d.', __METHOD__, $maxLength));
         }
diff --git a/src/Symfony/Component/Console/Question/Question.php b/src/Symfony/Component/Console/Question/Question.php
@@ -33,8 +33,8 @@ class Question
     private $multiline = false;
 
     /**
-     * @param string $question The question to ask to the user
-     * @param mixed  $default  The default answer to return if the user enters nothing
+     * @param string                     $question The question to ask to the user
+     * @param string|bool|int|float|null $default  The default answer to return if the user enters nothing
      */
     public function __construct(string $question, $default = null)
     {
@@ -55,7 +55,7 @@ public function getQuestion()
     /**
      * Returns the default answer.
      *
-     * @return mixed
+     * @return string|bool|int|float|null
      */
     public function getDefault()
     {
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -107,7 +107,7 @@ public function getParameterBag()
     /**
      * Gets a parameter.
      *
-     * @return mixed
+     * @return array|bool|string|int|float|null
      *
      * @throws InvalidArgumentException if the parameter is not defined
      */
@@ -127,8 +127,8 @@ public function hasParameter(string $name)
     /**
      * Sets a parameter.
      *
-     * @param string $name  The parameter name
-     * @param mixed  $value The parameter value
+     * @param string                           $name  The parameter name
+     * @param array|bool|string|int|float|null $value The parameter value
      */
     public function setParameter(string $name, $value)
     {
diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
@@ -63,7 +63,7 @@ public function has(string $id);
     public function initialized(string $id);
 
     /**
-     * @return mixed
+     * @return array|bool|string|int|float|null
      *
      * @throws InvalidArgumentException if the parameter is not defined
      */
@@ -77,8 +77,8 @@ public function hasParameter(string $name);
     /**
      * Sets a parameter.
      *
-     * @param string $name  The parameter name
-     * @param mixed  $value The parameter value
+     * @param string                           $name  The parameter name
+     * @param array|bool|string|int|float|null $value The parameter value
      */
     public function setParameter(string $name, $value);
 }
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php
@@ -36,7 +36,7 @@ public function all()
     /**
      * {@inheritdoc}
      *
-     * @return mixed
+     * @return array|bool|string|int|float|null
      */
     public function get(string $name)
     {
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
@@ -45,7 +45,7 @@ public function all();
     /**
      * Gets a service container parameter.
      *
-     * @return mixed The parameter value
+     * @return array|bool|string|int|float|null
      *
      * @throws ParameterNotFoundException if the parameter is not defined
      */
@@ -59,7 +59,7 @@ public function remove(string $name);
     /**
      * Sets a service container parameter.
      *
-     * @param mixed $value The parameter value
+     * @param array|bool|string|int|float|null $value The parameter value
      *
      * @throws LogicException if the parameter can not be set
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -51,7 +51,6 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\WitherStaticReturnType;
 use Symfony\Component\DependencyInjection\TypedReference;
-use Symfony\Component\DependencyInjection\Variable;
 use Symfony\Component\ExpressionLanguage\Expression;
 
 require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
@@ -170,28 +169,6 @@ public function testDumpCustomContainerClassWithMandatoryArgumentLessConstructor
         $this->assertStringEqualsFile(self::$fixturesPath.'/php/custom_container_class_with_mandatory_constructor_arguments.php', $dumper->dump(['base_class' => 'ConstructorWithMandatoryArgumentsContainer', 'namespace' => 'Symfony\Component\DependencyInjection\Tests\Fixtures\Container']));
     }
 
-    /**
-     * @dataProvider provideInvalidParameters
-     */
-    public function testExportParameters($parameters)
-    {
-        $this->expectException(\InvalidArgumentException::class);
-        $container = new ContainerBuilder(new ParameterBag($parameters));
-        $container->compile();
-        $dumper = new PhpDumper($container);
-        $dumper->dump();
-    }
-
-    public function provideInvalidParameters()
-    {
-        return [
-            [['foo' => new Definition('stdClass')]],
-            [['foo' => new Expression('service("foo").foo() ~ (container.hasParameter("foo") ? parameter("foo") : "default")')]],
-            [['foo' => new Reference('foo')]],
-            [['foo' => new Variable('foo')]],
-        ];
-    }
-
     public function testAddParameters()
     {
         $container = include self::$fixturesPath.'/containers/container8.php';
diff --git a/src/Symfony/Component/Lock/Store/SemaphoreStore.php b/src/Symfony/Component/Lock/Store/SemaphoreStore.php
@@ -62,7 +62,7 @@ private function lock(Key $key, bool $blocking)
             return;
         }
 
-        $keyId = crc32($key);
+        $keyId = unpack('i', md5($key, true))[1];
         $resource = sem_get($keyId);
         $acquired = @sem_acquire($resource, !$blocking);
 
diff --git a/src/Symfony/Component/Notifier/Test/TransportTestCase.php b/src/Symfony/Component/Notifier/Test/TransportTestCase.php
@@ -96,7 +96,7 @@ public function testCanSetCustomHost()
 
         $transport->setHost($customHost = self::CUSTOM_HOST);
 
-        $this->assertStringContainsString(sprintf('://%s', $customHost), (string) $transport);
+        $this->assertMatchesRegularExpression(sprintf('/^.*\:\/\/(%s|.*\@%s)/', $customHost, $customHost), (string) $transport);
     }
 
     public function testCanSetCustomPort()
@@ -106,9 +106,9 @@ public function testCanSetCustomPort()
         $transport->setPort($customPort = self::CUSTOM_PORT);
 
         /*
-         * @see https://regex101.com/r/0xQKuY/2
+         * @see https://regex101.com/r/shT9O2/1
          */
-        $this->assertMatchesRegularExpression(sprintf('/^.*\/\/.*\:%s.*$/', $customPort), (string) $transport);
+        $this->assertMatchesRegularExpression(sprintf('/^.*\:\/\/.*(\@.*)?\:%s((\?.*|\/.*))?$/', $customPort), (string) $transport);
     }
 
     public function testCanSetCustomHostAndPort()
@@ -118,6 +118,6 @@ public function testCanSetCustomHostAndPort()
         $transport->setHost($customHost = self::CUSTOM_HOST);
         $transport->setPort($customPort = self::CUSTOM_PORT);
 
-        $this->assertStringContainsString(sprintf('://%s:%s', $customHost, $customPort), (string) $transport);
+        $this->assertMatchesRegularExpression(sprintf('/^.*\:\/\/(%s|.*\@%s)\:%s/', $customHost, $customHost, $customPort), (string) $transport);
     }
 }
diff --git a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
@@ -67,7 +67,7 @@ public function validate($password, Constraint $constraint)
         }
 
         if (!$user instanceof PasswordAuthenticatedUserInterface) {
-            trigger_deprecation('symfony/security-core', '5.3', 'Using the "%s" validation constraint is deprecated.', PasswordAuthenticatedUserInterface::class, get_debug_type($user), UserPassword::class);
+            trigger_deprecation('symfony/security-core', '5.3', 'Using the "%s" validation constraint without implementing the "%s" interface is deprecated, the "%s" class should implement it.', UserPassword::class, PasswordAuthenticatedUserInterface::class, get_debug_type($user));
         }
 
         $salt = $user->getSalt();

Original file line number	Diff line number	Diff line change
`@@ -186,9 +186,7 @@ public function getArgumentRequiredCount()`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`/**`
`189`		`- * Gets the default values.`
`190`		`- *`
`191`		`- * @return array An array of default values`
	`189`	`+ * @return array<string\|bool\|int\|float\|array\|null>`
`192`	`190`	`*/`
`193`	`191`	`public function getArgumentDefaults()`
`194`	`192`	`{`
`@@ -329,9 +327,7 @@ public function getOptionForShortcut(string $shortcut)`
`329`	`327`	`}`
`330`	`328`
`331`	`329`	`/**`
`332`		`- * Gets an array of default values.`
`333`		`- *`
`334`		`- * @return array An array of all default values`
	`330`	`+ * @return array<string\|bool\|int\|float\|array\|null>`
`335`	`331`	`*/`
`336`	`332`	`public function getOptionDefaults()`
`337`	`333`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ class Question`
`33`	`33`	`private $multiline = false;`
`34`	`34`
`35`	`35`	`/**`
`36`		`- * @param string $question The question to ask to the user`
`37`		`- * @param mixed $default The default answer to return if the user enters nothing`
	`36`	`+ * @param string $question The question to ask to the user`
	`37`	`+ * @param string\|bool\|int\|float\|null $default The default answer to return if the user enters nothing`
`38`	`38`	`*/`
`39`	`39`	`public function __construct(string $question, $default = null)`
`40`	`40`	`{`
`@@ -55,7 +55,7 @@ public function getQuestion()`
`55`	`55`	`/**`
`56`	`56`	`* Returns the default answer.`
`57`	`57`	`*`
`58`		`- * @return mixed`
	`58`	`+ * @return string\|bool\|int\|float\|null`
`59`	`59`	`*/`
`60`	`60`	`public function getDefault()`
`61`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function getParameterBag()`
`107`	`107`	`/**`
`108`	`108`	`* Gets a parameter.`
`109`	`109`	`*`
`110`		`- * @return mixed`
	`110`	`+ * @return array\|bool\|string\|int\|float\|null`
`111`	`111`	`*`
`112`	`112`	`* @throws InvalidArgumentException if the parameter is not defined`
`113`	`113`	`*/`
`@@ -127,8 +127,8 @@ public function hasParameter(string $name)`
`127`	`127`	`/**`
`128`	`128`	`* Sets a parameter.`
`129`	`129`	`*`
`130`		`- * @param string $name The parameter name`
`131`		`- * @param mixed $value The parameter value`
	`130`	`+ * @param string $name The parameter name`
	`131`	`+ * @param array\|bool\|string\|int\|float\|null $value The parameter value`
`132`	`132`	`*/`
`133`	`133`	`public function setParameter(string $name, $value)`
`134`	`134`	`{`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function has(string $id);`
`63`	`63`	`public function initialized(string $id);`
`64`	`64`
`65`	`65`	`/**`
`66`		`- * @return mixed`
	`66`	`+ * @return array\|bool\|string\|int\|float\|null`
`67`	`67`	`*`
`68`	`68`	`* @throws InvalidArgumentException if the parameter is not defined`
`69`	`69`	`*/`
`@@ -77,8 +77,8 @@ public function hasParameter(string $name);`
`77`	`77`	`/**`
`78`	`78`	`* Sets a parameter.`
`79`	`79`	`*`
`80`		`- * @param string $name The parameter name`
`81`		`- * @param mixed $value The parameter value`
	`80`	`+ * @param string $name The parameter name`
	`81`	`+ * @param array\|bool\|string\|int\|float\|null $value The parameter value`
`82`	`82`	`*/`
`83`	`83`	`public function setParameter(string $name, $value);`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function all()`
`36`	`36`	`/**`
`37`	`37`	`* {@inheritdoc}`
`38`	`38`	`*`
`39`		`- * @return mixed`
	`39`	`+ * @return array\|bool\|string\|int\|float\|null`
`40`	`40`	`*/`
`41`	`41`	`public function get(string $name)`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function all();`
`45`	`45`	`/**`
`46`	`46`	`* Gets a service container parameter.`
`47`	`47`	`*`
`48`		`- * @return mixed The parameter value`
	`48`	`+ * @return array\|bool\|string\|int\|float\|null`
`49`	`49`	`*`
`50`	`50`	`* @throws ParameterNotFoundException if the parameter is not defined`
`51`	`51`	`*/`
`@@ -59,7 +59,7 @@ public function remove(string $name);`
`59`	`59`	`/**`
`60`	`60`	`* Sets a service container parameter.`
`61`	`61`	`*`
`62`		`- * @param mixed $value The parameter value`
	`62`	`+ * @param array\|bool\|string\|int\|float\|null $value The parameter value`
`63`	`63`	`*`
`64`	`64`	`* @throws LogicException if the parameter can not be set`
`65`	`65`	`*/`