From a70b71b50ed38b79fc54ad81acb06f1ade72e942 Mon Sep 17 00:00:00 2001 From: HypeMC Date: Wed, 20 Jan 2021 03:36:28 +0100 Subject: [PATCH 1/2] Fix typo in property name --- src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php index 8dd4808fe8..2a02905d24 100644 --- 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 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe $this->verbosityLevelMap = $verbosityLevelMap; } - $this->consoleFormaterOptions = $consoleFormaterOptions; + $this->consoleFormatterOptions = $consoleFormatterOptions; } /** @@ -167,13 +167,13 @@ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscribe 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)); } /** From 91c360ec752447c83a95b78f0743e37d5d076bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= Date: Thu, 21 Jan 2021 16:51:17 +0100 Subject: [PATCH 2/2] Remove wrong test --- .../Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php index 5b2999fed0..1a672d70f8 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php @@ -36,7 +36,6 @@ class CsrfFormLoginTest extends AbstractWebTestCase $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]);