8000 [HttpFoundation] Fix PHP 8.1 deprecation in isNotModified · symfony/symfony@b909acf · GitHub
[go: up one dir, main page]
Skip to content

Commit b909acf

Browse files
HypeMCHypeMC
committed
[HttpFoundation] Fix PHP 8.1 deprecation in isNotModified
1 parent 495eba3 commit b909acf

File tree

2 files changed

+15
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -1079,8 +1079,7 @@ public function isNotModified(Request $request): bool
10791079
$lastModified = $this->headers->get('Last-Modified');
10801080
$modifiedSince = $request->headers->get('If-Modified-Since');
10811081

1082-
if ($ifNoneMatchEtags = $request->getETags()) {
1083-
$etag = $this->getEtag();
1082+
if (($ifNoneMatchEtags = $request->getETags()) && (null !== $etag = $this->getEtag())) {
10841083
if (0 == strncmp($etag, 'W/', 2)) {
10851084
$etag = substr($etag, 2);
10861085
}
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,20 @@ public function testIsNotModifiedIfModifiedSinceAndEtagWithoutLastModified()
284284
$this->assertFalse($response->isNotModified($request));
285285
}
286286

287+
public function testIfNoneMatchWithoutETag()
288+
{
289+
$request = new Request();
290+
$request->headers->set('If-None-Match', 'randomly_generated_etag');
291+
292+
$this->assertFalse((new Response())->isNotModified($request));
293+
294+
// Test wildcard
295+
$request = new Request();
296+
$request->headers->set('If-None-Match', '*');
297+
298+
$this->assertFalse((new Response())->isNotModified($request));
299+
}
300+
287301
public function testIsValidateable()
288302
{
289303
$response = new Response('', 200, ['Last-Modified' => $this->createDateTimeOneHourAgo()->format(\DATE_RFC2822)]);