From bff930ae43e0bb2bf7f1eeb1dceeb1d850ccba89 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 30 Aug 2021 14:32:54 +0200 Subject: [PATCH 1/5] Bump Symfony version to 4.4.31 --- Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Kernel.php b/Kernel.php index 6c816aaf63..8ce7e14592 100644 --- a/Kernel.php +++ b/Kernel.php @@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private static $freshCache = []; - public const VERSION = '4.4.30'; - public const VERSION_ID = 40430; + public const VERSION = '4.4.31-DEV'; + public const VERSION_ID = 40431; public const MAJOR_VERSION = 4; public const MINOR_VERSION = 4; - public const RELEASE_VERSION = 30; - public const EXTRA_VERSION = ''; + public const RELEASE_VERSION = 31; + public const EXTRA_VERSION = 'DEV'; public const END_OF_MAINTENANCE = '11/2022'; public const END_OF_LIFE = '11/2023'; From 16caffda568e5ce70eabaf90204ba7660dc1936c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20de=20Marqu=C3=A9=20Fromentin?= Date: Wed, 1 Sep 2021 16:36:38 +0200 Subject: [PATCH 2/5] [HttpKernel] Fix timeline in profiler Simple fix to #42804 --- DataCollector/TimeDataCollector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DataCollector/TimeDataCollector.php b/DataCollector/TimeDataCollector.php index 7c0cdaa90d..b83c44a48d 100644 --- a/DataCollector/TimeDataCollector.php +++ b/DataCollector/TimeDataCollector.php @@ -47,7 +47,7 @@ public function collect(Request $request, Response $response/*, \Throwable $exce } $this->data = [ - 'token' => $response->headers->get('X-Debug-Token'), + 'token' => $request->attributes->get('_stopwatch_token'), 'start_time' => $startTime * 1000, 'events' => [], 'stopwatch_installed' => class_exists(Stopwatch::class, false), From 4619cd0da8b1528ee3d75e0187ac2349a523817e Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Mon, 6 Sep 2021 19:40:00 +0200 Subject: [PATCH 3/5] [HttpKernel] Fix broken mock Signed-off-by: Alexander M. Turek --- Tests/CacheClearer/Psr6CacheClearerTest.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Tests/CacheClearer/Psr6CacheClearerTest.php b/Tests/CacheClearer/Psr6CacheClearerTest.php index 0c6f1543ac..26b323f810 100644 --- a/Tests/CacheClearer/Psr6CacheClearerTest.php +++ b/Tests/CacheClearer/Psr6CacheClearerTest.php @@ -32,9 +32,11 @@ public function testClearPool() $pool = $this->createMock(CacheItemPoolInterface::class); $pool ->expects($this->once()) - ->method('clear'); + ->method('clear') + ->willReturn(true) + ; - (new Psr6CacheClearer(['pool' => $pool]))->clearPool('pool'); + $this->assertTrue((new Psr6CacheClearer(['pool' => $pool]))->clearPool('pool')); } public function testClearPoolThrowsExceptionOnUnreferencedPool() From 2d582ef28f88ce1d0337173e4d59c9a4d33a2649 Mon Sep 17 00:00:00 2001 From: BoShurik Date: Thu, 9 Sep 2021 17:49:32 +0300 Subject: [PATCH 4/5] Relax service locator tests. Allow any order --- .../RegisterControllerArgumentLocatorsPassTest.php | 3 ++- .../RemoveEmptyControllerArgumentLocatorsPassTest.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php index c00e1849fc..5a0964f6c2 100644 --- a/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php +++ b/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php @@ -236,7 +236,8 @@ public function testNoExceptionOnNonExistentTypeHintOptionalArg() $pass->process($container); $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0); - $this->assertSame(['foo::barAction', 'foo::fooAction'], array_keys($locator)); + + $this->assertEqualsCanonicalizing(['foo::barAction', 'foo::fooAction'], array_keys($locator)); } public function testArgumentWithNoTypeHintIsOk() diff --git a/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php b/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php index b5e55bdea9..b9dd84d592 100644 --- a/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php +++ b/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php @@ -57,7 +57,7 @@ public function testProcess() 'Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass: Removing method "setTestCase" of service "c2" from controller candidates: the method is called at instantiation, thus cannot be an action.', ]; - $this->assertSame($expectedLog, $container->getCompiler()->getLog()); + $this->assertEqualsCanonicalizing($expectedLog, $container->getCompiler()->getLog()); } public function testInvoke() From 85562e667062320f22bf9943e38c745ea17d05dc Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 28 Sep 2021 10:48:01 +0200 Subject: [PATCH 5/5] Update VERSION for 4.4.31 --- Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Kernel.php b/Kernel.php index 8ce7e14592..4578541b2a 100644 --- a/Kernel.php +++ b/Kernel.php @@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private static $freshCache = []; - public const VERSION = '4.4.31-DEV'; + public const VERSION = '4.4.31'; public const VERSION_ID = 40431; public const MAJOR_VERSION = 4; public const MINOR_VERSION = 4; public const RELEASE_VERSION = 31; - public const EXTRA_VERSION = 'DEV'; + public const EXTRA_VERSION = ''; public const END_OF_MAINTENANCE = '11/2022'; public const END_OF_LIFE = '11/2023'; pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy