Merge branch '6.1' into 6.2

* 6.1:
  fix merge
  [FrameworkBundle] Allow to specify `null` for exception mapping configuration values
  Fix BinaryFileResponse content type detection logic
  [Notifier] [Expo] Throw exception on error-response from expo api
  Bump Symfony version to 6.1.6
  Update VERSION for 6.1.5
  Update CHANGELOG for 6.1.5
  Bump Symfony version to 6.0.14
  Update VERSION for 6.0.13
  Update CHANGELOG for 6.0.13
  Bump Symfony version to 5.4.14
  Update VERSION for 5.4.13
  Update CHANGELOG for 5.4.13
  Bump Symfony version to 4.4.47
  Update VERSION for 4.4.46
  Update CONTRIBUTORS for 4.4.46
  Update CHANGELOG for 4.4.46
  [Security] Fix login url matching when app is not run with url rewriting or from a sub folder
  [symfony/mailjet-mailer] Fix bug #47701

Author: xabbuh

BinaryFileResponse.php

@@ -179,9 +179,9 @@ public function setContentDisposition(string $disposition, string $filename = ''
 
     public function prepare(Request $request): static
     {
-        parent::prepare($request);
-
         if ($this->isInformational() || $this->isEmpty()) {
+            parent::prepare($request);
+
             $this->maxlen = 0;
 
             return $this;
@@ -191,6 +191,8 @@ public function prepare(Request $request): static
             $this->headers->set('Content-Type', $this->file->getMimeType() ?: 'application/octet-stream');
         }
 
+        parent::prepare($request);
+
         $this->offset = 0;
         $this->maxlen = -1;
 

Tests/BinaryFileResponseTest.php

@@ -387,6 +387,32 @@ public function testPrepareNotAddingContentTypeHeaderIfNoContentResponse()
         $this->assertFalse($response->headers->has('Content-Type'));
     }
 
+    public function testContentTypeIsCorrectlyDetected()
+    {
+        $response = new BinaryFileResponse(__DIR__.'/File/Fixtures/test.gif');
+
+        $request = Request::create('/');
+        $response->prepare($request);
+
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame('image/gif', $response->headers->get('Content-Type'));
+    }
+
+    public function testContentTypeIsNotGuessedWhenTheFileWasNotModified()
+    {
+        $response = new BinaryFileResponse(__DIR__.'/File/Fixtures/test.gif');
+        $response->setAutoLastModified();
+
+        $request = Request::create('/');
+        $request->headers->set('If-Modified-Since', $response->getLastModified()->format('D, d M Y H:i:s').' GMT');
+        $isNotModified = $response->isNotModified($request);
+        $this->assertTrue($isNotModified);
+        $response->prepare($request);
+
+        $this->assertSame(304, $response->getStatusCode());
+        $this->assertFalse($response->headers->has('Content-Type'));
+    }
+
     protected function provideResponse()
     {
         return new BinaryFileResponse(__DIR__.'/../README.md', 200, ['Content-Type' => 'application/octet-stream']);