Merge branch '4.4' into 5.1

jderusse · jderusse · commit 7e2ac5ff33c2 · 2021-01-21T17:54:24.000+01:00
* 4.4:
  Remove wrong test
  Fix typo in property name
diff --git a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
@@ -51,7 +51,7 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe
         OutputInterface::VERBOSITY_VERY_VERBOSE => Logger::INFO,
         OutputInterface::VERBOSITY_DEBUG => Logger::DEBUG,
     ];
-    private $consoleFormaterOptions;
+    private $consoleFormatterOptions;
 
     /**
      * @param OutputInterface|null $output            The console output to use (the handler remains disabled when passing null
@@ -60,7 +60,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, bool $bubble = true, array $verbosityLevelMap = [], array $consoleFormaterOptions = [])
+    public function __construct(OutputInterface $output = null, bool $bubble = true, array $verbosityLevelMap = [], array $consoleFormatterOptions = [])
     {
         parent::__construct(Logger::DEBUG, $bubble);
         $this->output = $output;
@@ -69,7 +69,7 @@ public function __construct(OutputInterface $output = null, bool $bubble = true,
             $this->verbosityLevelMap = $verbosityLevelMap;
         }
 
-        $this->consoleFormaterOptions = $consoleFormaterOptions;
+        $this->consoleFormatterOptions = $consoleFormatterOptions;
     }
 
     /**
@@ -159,13 +159,13 @@ protected function getDefaultFormatter(): FormatterInterface
             return new LineFormatter();
         }
         if (!$this->output) {
-            return new ConsoleFormatter($this->consoleFormaterOptions);
+            return new ConsoleFormatter($this->consoleFormatterOptions);
         }
 
         return new ConsoleFormatter(array_replace([
             'colors' => $this->output->isDecorated(),
             'multiline' => OutputInterface::VERBOSITY_DEBUG <= $this->output->getVerbosity(),
-        ], $this->consoleFormaterOptions));
+        ], $this->consoleFormatterOptions));
     }
 
     /**
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php
@@ -36,7 +36,6 @@ public function testFormLoginAndLogoutWithCsrfTokens($options)
         $logoutLinks = $crawler->selectLink('Log out')->links();
         $this->assertCount(2, $logoutLinks);
         $this->assertStringContainsString('_csrf_token=', $logoutLinks[0]->getUri());
-        $this->assertSame($logoutLinks[0]->getUri(), $logoutLinks[1]->getUri());
 
         $client->click($logoutLinks[0]);
 
