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),
diff --git a/Kernel.php b/Kernel.php
index 6c816aaf63..4578541b2a 100644
--- a/Kernel.php
+++ b/Kernel.php
@@ -76,11 +76,11 @@ 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';
+ public const VERSION_ID = 40431;
public const MAJOR_VERSION = 4;
public const MINOR_VERSION = 4;
- public const RELEASE_VERSION = 30;
+ public const RELEASE_VERSION = 31;
public const EXTRA_VERSION = '';
public const END_OF_MAINTENANCE = '11/2022';
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()
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()
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