[HttpFoundation] Fix PHP 8.1 deprecation in isNotModified

HypeMC · HypeMC · commit e436f1de73e2 · 2022-03-04T06:49:06.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -1079,8 +1079,7 @@ public function isNotModified(Request $request): bool
         $lastModified = $this->headers->get('Last-Modified');
         $modifiedSince = $request->headers->get('If-Modified-Since');
 
-        if ($ifNoneMatchEtags = $request->getETags()) {
-            $etag = $this->getEtag();
+        if (($ifNoneMatchEtags = $request->getETags()) && (null !== $etag = $this->getEtag())) {
             if (0 == strncmp($etag, 'W/', 2)) {
                 $etag = substr($etag, 2);
             }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -284,6 +284,14 @@ public function testIsNotModifiedIfModifiedSinceAndEtagWithoutLastModified()
         $this->assertFalse($response->isNotModified($request));
     }
 
+    public function testIfNoneMatchWithoutETag()
+    {
+        $request = new Request();
+        $request->headers->set('If-None-Match', 'randomly_generated_etag');
+
+        $this->assertFalse((new Response())->isNotModified($request));
+    }
+
     public function testIsValidateable()
     {
         $response = new Response('', 200, ['Last-Modified' => $this->createDateTimeOneHourAgo()->format(\DATE_RFC2822)]);

Original file line number	Diff line number	Diff line change
`@@ -1079,8 +1079,7 @@ public function isNotModified(Request $request): bool`
`1079`	`1079`	`$lastModified = $this->headers->get('Last-Modified');`
`1080`	`1080`	`$modifiedSince = $request->headers->get('If-Modified-Since');`
`1081`	`1081`
`1082`		`- if ($ifNoneMatchEtags = $request->getETags()) {`
`1083`		`- $etag = $this->getEtag();`
	`1082`	`+ if (($ifNoneMatchEtags = $request->getETags()) && (null !== $etag = $this->getEtag())) {`
`1084`	`1083`	`if (0 == strncmp($etag, 'W/', 2)) {`
`1085`	`1084`	`$etag = substr($etag, 2);`
`1086`	`1085`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,14 @@ public function testIsNotModifiedIfModifiedSinceAndEtagWithoutLastModified()`
`284`	`284`	`$this->assertFalse($response->isNotModified($request));`
`285`	`285`	`}`
`286`	`286`
	`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`	`+`
`287`	`295`	`public function testIsValidateable()`
`288`	`296`	`{`
`289`	`297`	`$response = new Response('', 200, ['Last-Modified' => $this->createDateTimeOneHourAgo()->format(\DATE_RFC2822)]);`