[4.4] CS fixes

nicolas-grekas · nicolas-grekas · commit eba09d47e790 · 2020-05-08T12:39:41.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php
@@ -25,7 +25,7 @@ class DoctrineTransactionMiddlewareTest extends MiddlewareTestCase
     private $entityManager;
     private $middleware;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->connection = $this->createMock(Connection::class);
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Mailer\Bridge\Mailchimp\Transport;
 
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mailer\Exception\HttpTransportException;
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\Transport\AbstractHttpTransport;
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php b/src/Symfony/Component/Security/Core/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/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
@@ -59,7 +59,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) {
diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
@@ -600,7 +600,7 @@ function showCurrent(state)
                     */
                     return;
                 }
-    
+
                 e.preventDefault();
                 search.className = search.className.replace(/\bsf-dump-search-hidden\b/, '');
                 searchInput.focus();

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class DoctrineTransactionMiddlewareTest extends MiddlewareTestCase`
`25`	`25`	`private $entityManager;`
`26`	`26`	`private $middleware;`
`27`	`27`
`28`		`- public function setUp(): void`
	`28`	`+ protected function setUp(): void`
`29`	`29`	`{`
`30`	`30`	`$this->connection = $this->createMock(Connection::class);`
`31`	`31`
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
`@@ -59,7 +59,7 @@ public function __construct(iterable $voters = [], string $strategy = self::STRA`
`59`	`59`	`*/`
`60`	`60`	`public function decide(TokenInterface $token, array $attributes, $object = null/, bool $allowMultipleAttributes = false/)`
`61`	`61`	`{`
`62`		`- $allowMultipleAttributes = 3 < func_num_args() && func_get_arg(3);`
	`62`	`+ $allowMultipleAttributes = 3 < \func_num_args() && func_get_arg(3);`
`63`	`63`
`64`	`64`	`// Special case for AccessListener, do not remove the right side of the condition before 6.0`
`65`	`65`	`if (\count($attributes) > 1 && !$allowMultipleAttributes) {`
Original file line number	Diff line number	Diff line change
`@@ -600,7 +600,7 @@ function showCurrent(state)`
`600`	`600`	`*/`
`601`	`601`	`return;`
`602`	`602`	`}`
`603`		`-`
	`603`	`+`
`604`	`604`	`e.preventDefault();`
`605`	`605`	`search.className = search.className.replace(/\bsf-dump-search-hidden\b/, '');`
`606`	`606`	`searchInput.focus();`