symfony · WebMamba · Oct 6, 2022
diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -125,7 +125,7 @@ public function setChunkSize(int $chunkSize): static
      */
     public function setAutoLastModified(): static
     {
-        $this->setLastModified(\DateTime::createFromFormat('U', $this->file->getMTime()));
+        $this->setLastModified(\DateTimeImmutable::createFromFormat('U', $this->file->getMTime()));
 
         return $this;
     }

diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -200,6 +200,24 @@ public function getDate(string $key, \DateTime $default = null): ?\DateTimeInter
         return $date;
     }
 
+    /**
+     * Returns the HTTP header value converted to a immutable date.
+     *
+     * @throws \RuntimeException When the HTTP header is not parseable
+     */
+    public function getImmutableDate(string $key, \DateTimeImmutable $default = null): ?\DateTimeImmutable
+    {
+        if (null === $value = $this->get($key)) {
+            return $default;
+        }
+
+        if (false === $date = \DateTimeImmutable::createFromFormat(\DATE_RFC2822, $value)) {
+            throw new \RuntimeException(sprintf('The "%s" HTTP header is not parseable (%s).', $key, $value));
+        }
+
+        return $date;
+    }
+
     /**
      * Adds a custom Cache-Control directive.
      */

diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -709,6 +709,20 @@ public function getExpires(): ?\DateTimeInterface
         }
     }
 
+    /**
+     * Returns the value of the Expires headers as a DateTimeImmutable instance
+     *
+     * @final
+     */
+    public function getExpiresImmutable(): ?\DateTimeImmutable
+    {
+        try {
+            return $this->headers->getImmutableDate('Expires');
+        } catch (\RuntimeException) {
+            return \DateTimeImmutable::createFromFormat('U', time() - 172800);
+        }
+    }
+
     /**
      * Sets the Expires HTTP header with a DateTime instance.
      *

diff --git a/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php
@@ -48,6 +48,13 @@ public function testGetDate()
         $this->assertInstanceOf(\DateTime::class, $headerDate);
     }
 
+    public function testGetImmutableDate()
+    {
+        $bag = new HeaderBag(['foo' => 'Tue, 4 Sep 2012 20:00:00 +0200']);
+        $headerDate = $bag->getImmutableDate('foo');
+        $this->assertInstanceOf(\DateTimeImmutable::class, $headerDate);
+    }
+
     public function testGetDateNull()
     {
         $bag = new HeaderBag(['foo' => null]);

diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -820,6 +820,7 @@ public function testSetExpires()
         $response->setExpires($now);
 
         $this->assertEquals($response->getExpires()->getTimestamp(), $now->getTimestamp());
+        $this->assertInstanceOf(\DateTimeImmutable::class, $response->getExpiresImmutable());
     }
 
     public function testSetExpiresWithImmutable()