Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit 862ed13ebf41 · 2020-05-08T14:34:39.000+02:00
* 4.4:
  [PhpUnitBridge] fix bad test
  [4.4] CS fixes
  [3.4] CS fixes
  Disable phpunit verbosity
  Queue name is a required parameter
  [FrameworkBundle] display actual target for error in AssetsInstallCommand
  Remove patches for Doctrine bugs and deprecations
  [Mime] fix bad method call on "EmailAddressContains"
  [DI][EventDispatcher] added contract for implementation
diff --git a/Authentication/Token/UsernamePasswordToken.php b/Authentication/Token/UsernamePasswordToken.php
@@ -26,7 +26,6 @@ class UsernamePasswordToken extends AbstractToken
     /**
      * @param string|\Stringable|UserInterface $user        The username (like a nickname, email address, etc.) or a UserInterface instance
      * @param mixed                            $credentials
-     * @param string                           $providerKey
      * @param string[]                         $roles
      *
      * @throws \InvalidArgumentException
diff --git a/Authorization/AccessDecisionManager.php b/Authorization/AccessDecisionManager.php
@@ -60,7 +60,7 @@ public function __construct(iterable $voters = [], string $strategy = self::STRA
      */
     public function decide(TokenInterface $token, array $attributes, $object = null/*, bool $allowMultipleAttributes = false*/)
     {
-        $allowMultipleAttributes =  3 < func_num_args() && func_get_arg(3);
+        $allowMultipleAttributes = 3 < \func_num_args() && func_get_arg(3);
 
         // Special case for AccessListener, do not remove the right side of the condition before 6.0
         if (\count($attributes) > 1 && !$allowMultipleAttributes) {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ class UsernamePasswordToken extends AbstractToken`
`26`	`26`	`/**`
`27`	`27`	`* @param string\|\Stringable\|UserInterface $user The username (like a nickname, email address, etc.) or a UserInterface instance`
`28`	`28`	`* @param mixed $credentials`
`29`		`- * @param string $providerKey`
`30`	`29`	`* @param string[] $roles`
`31`	`30`	`*`
`32`	`31`	`* @throws \InvalidArgumentException`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function __construct(iterable $voters = [], string $strategy = self::STRA`
`60`	`60`	`*/`
`61`	`61`	`public function decide(TokenInterface $token, array $attributes, $object = null/, bool $allowMultipleAttributes = false/)`
`62`	`62`	`{`
`63`		`- $allowMultipleAttributes = 3 < func_num_args() && func_get_arg(3);`
	`63`	`+ $allowMultipleAttributes = 3 < \func_num_args() && func_get_arg(3);`
`64`	`64`
`65`	`65`	`// Special case for AccessListener, do not remove the right side of the condition before 6.0`
`66`	`66`	`if (\count($attributes) > 1 && !$allowMultipleAttributes) {`