Skip to content

Commit 3991b99

Browse files
Merge branch '6.0' into 6.1
* 6.0: [HttpClient] Fix computing retry delay when using RetryableHttpClient [Uid] Fix validating UUID variant bits [Validator][UID] Stop to first ULID format violation [Bridge] Fix mkdir() race condition in ProxyCacheWarmer [Cache] update readme Bug #42343 [Security] Fix valid remember-me token exposure to the second consequent request Prevent exception if request stack is empty Psr18Client ignore invalid HTTP headers skip a transient test on AppVeyor
2 parents 53aa7cf + 49330cc commit 3991b99

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

DataCollector/RequestDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function collect(Request $request, Response $response, \Throwable $except
110110
'session_metadata' => $sessionMetadata,
111111
'session_attributes' => $sessionAttributes,
112112
'session_usages' => array_values($this->sessionUsages),
113-
'stateless_check' => $this->requestStack?->getMainRequest()->attributes->get('_stateless') ?? false,
113+
'stateless_check' => $this->requestStack?->getMainRequest()?->attributes->get('_stateless') ?? false,
114114
'flashes' => $flashes,
115115
'path_info' => $request->getPathInfo(),
116116
'controller' => 'n/a',

Tests/DataCollector/RequestDataCollectorTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,15 @@ public function testStatelessCheck()
312312
$collector->lateCollect();
313313

314314
$this->assertTrue($collector->getStatelessCheck());
315+
316+
$requestStack = new RequestStack();
317+
$request = $this->createRequest();
318+
319+
$collector = new RequestDataCollector($requestStack);
320+
$collector->collect($request, $response = $this->createResponse());
321+
$collector->lateCollect();
322+
323+
$this->assertFalse($collector->getStatelessCheck());
315324
}
316325

317326
public function testItHidesPassword()

0 commit comments

Comments
 (0)