Merge branch '5.4' into 6.0

* 5.4:
  Fix skip condition for INTL
  [Messenger] Fix `ErrorDetailsStamp` denormalization
  [Translation] Extract translatable content on twig set
  Simplify code
  [FrameworkBundle] Add BrowserKitAssertionsTrait::assertThatForBrowser
  Fix composer.json versions
  [Ldap] Fixing the behaviour of getting LDAP Attributes
  Fix composer.json versions
  Remove redundant license info
  [HttpFoundation] Fix isNotModified determination logic
  Fix Url Validator false positives
  [Translation] Reverse fallback locales
  [Console] Backport minor refactorings
  [FrameworkBundle] Fall back to default configuration in debug:config and consistently resolve parameter values
  notifier smsapi - fixed checking whether message is sent
  allow null for framework.translator.default_path
  improve failure messages of the CrawlerSelectorTextContains constraint

Author: nicolas-grekas

HttpCache/HttpCache.php

@@ -5,12 +5,14 @@
  *
  * (c) Fabien Potencier <fabien@symfony.com>
  *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
  * This code is partially based on the Rack-Cache library by Ryan Tomayko,
  * which is released under the MIT license.
  * (based on commit 02d2b48d75bcb63cf1c0c7149c077ad256542801)
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
  */
 
 namespace Symfony\Component\HttpKernel\HttpCache;
@@ -362,7 +364,7 @@ protected function validate(Request $request, Response $entry, bool $catch = fal
 
         // add our cached last-modified validator
         if ($entry->headers->has('Last-Modified')) {
-            $subRequest->headers->set('if_modified_since', $entry->headers->get('Last-Modified'));
+            $subRequest->headers->set('If-Modified-Since', $entry->headers->get('Last-Modified'));
         }
 
         // Add our cached etag validator to the environment.
@@ -371,7 +373,7 @@ protected function validate(Request $request, Response $entry, bool $catch = fal
         $cachedEtags = $entry->getEtag() ? [$entry->getEtag()] : [];
         $requestEtags = $request->getETags();
         if ($etags = array_unique(array_merge($cachedEtags, $requestEtags))) {
-            $subRequest->headers->set('if_none_match', implode(', ', $etags));
+            $subRequest->headers->set('If-None-Match', implode(', ', $etags));
         }
 
         $response = $this->forward($subRequest, $catch, $entry);
@@ -422,8 +424,8 @@ protected function fetch(Request $request, bool $catch = false): Response
         }
 
         // avoid that the backend sends no content
-        $subRequest->headers->remove('if_modified_since');
-        $subRequest->headers->remove('if_none_match');
+        $subRequest->headers->remove('If-Modified-Since');
+        $subRequest->headers->remove('If-None-Match');
 
         $response = $this->forward($subRequest, $catch);
 

Tests/HttpCache/HttpCacheTest.php

@@ -156,7 +156,7 @@ public function testRespondsWith304WhenIfNoneMatchMatchesETag()
         $this->assertTraceContains('store');
     }
 
-    public function testRespondsWith304OnlyIfIfNoneMatchAndIfModifiedSinceBothMatch()
+    public function testRespondsWith304WhenIfNoneMatchAndIfModifiedSinceBothMatch()
     {
         $time = \DateTime::createFromFormat('U', time());
 
@@ -172,7 +172,7 @@ public function testRespondsWith304OnlyIfIfNoneMatchAndIfModifiedSinceBothMatch(
         $t = \DateTime::createFromFormat('U', time() - 3600);
         $this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '12345', 'HTTP_IF_MODIFIED_SINCE' => $t->format(\DATE_RFC2822)]);
         $this->assertHttpKernelIsCalled();
-        $this->assertEquals(200, $this->response->getStatusCode());
+        $this->assertEquals(304, $this->response->getStatusCode());
 
         // only Last-Modified matches
         $this->request('GET', '/', ['HTTP_IF_NONE_MATCH' => '1234', 'HTTP_IF_MODIFIED_SINCE' => $time->format(\DATE_RFC2822)]);