diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
index 0d3a23d4d2019..5a874aa6bb810 100644
--- a/src/Symfony/Component/HttpFoundation/Response.php
+++ b/src/Symfony/Component/HttpFoundation/Response.php
@@ -672,9 +672,13 @@ public function getDate()
*
* @final since version 3.2
*/
- public function setDate(\DateTime $date)
+ public function setDate(\DateTimeInterface $date)
{
- $date->setTimezone(new \DateTimeZone('UTC'));
+ if ($date instanceof \DateTime) {
+ $date = \DateTimeImmutable::createFromMutable($date);
+ }
+
+ $date = $date->setTimezone(new \DateTimeZone('UTC'));
$this->headers->set('Date', $date->format('D, d M Y H:i:s').' GMT');
return $this;
@@ -732,22 +736,27 @@ public function getExpires()
*
* Passing null as value will remove the header.
*
- * @param \DateTime|null $date A \DateTime instance or null to remove the header
+ * @param \DateTimeInterface|null $date A \DateTime instance or null to remove the header
*
* @return $this
*
* @final since version 3.2
*/
- public function setExpires(\DateTime $date = null)
+ public function setExpires(\DateTimeInterface $date = null)
{
if (null === $date) {
$this->headers->remove('Expires');
- } else {
- $date = clone $date;
- $date->setTimezone(new \DateTimeZone('UTC'));
- $this->headers->set('Expires', $date->format('D, d M Y H:i:s').' GMT');
+
+ return $this;
+ }
+
+ if ($date instanceof \DateTime) {
+ $date = \DateTimeImmutable::createFromMutable($date);
}
+ $date = $date->setTimezone(new \DateTimeZone('UTC'));
+ $this->headers->set('Expires', $date->format('D, d M Y H:i:s').' GMT');
+
return $this;
}
@@ -888,22 +897,27 @@ public function getLastModified()
*
* Passing null as value will remove the header.
*
- * @param \DateTime|null $date A \DateTime instance or null to remove the header
+ * @param \DateTimeInterface|null $date A \DateTime instance or null to remove the header
*
* @return $this
*
* @final since version 3.2
*/
- public function setLastModified(\DateTime $date = null)
+ public function setLastModified(\DateTimeInterface $date = null)
{
if (null === $date) {
$this->headers->remove('Last-Modified');
- } else {
- $date = clone $date;
- $date->setTimezone(new \DateTimeZone('UTC'));
- $this->headers->set('Last-Modified', $date->format('D, d M Y H:i:s').' GMT');
+
+ return $this;
}
+ if ($date instanceof \DateTime) {
+ $date = \DateTimeImmutable::createFromMutable($date);
+ }
+
+ $date = $date->setTimezone(new \DateTimeZone('UTC'));
+ $this->headers->set('Last-Modified', $date->format('D, d M Y H:i:s').' GMT');
+
return $this;
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
index 9c5b34febfa30..4f7dc2817a1b9 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -653,6 +653,22 @@ public function testIsImmutable()
$this->assertTrue($response->isImmutable());
}
+ public function testSetDate()
+ {
+ $response = new Response();
+ $response->setDate(\DateTime::createFromFormat(\DateTime::ATOM, '2013-01-26T09:21:56+0100', new \DateTimeZone('Europe/Berlin')));
+
+ $this->assertEquals('2013-01-26T08:21:56+00:00', $response->getDate()->format(\DateTime::ATOM));
+ }
+
+ public function testSetDateWithImmutable()
+ {
+ $response = new Response();
+ $response->setDate(\DateTimeImmutable::createFromFormat(\DateTime::ATOM, '2013-01-26T09:21:56+0100', new \DateTimeZone('Europe/Berlin')));
+
+ $this->assertEquals('2013-01-26T08:21:56+00:00', $response->getDate()->format(\DateTime::ATOM));
+ }
+
public function testSetExpires()
{
$response = new Response();
@@ -666,6 +682,16 @@ public function testSetExpires()
$this->assertEquals($response->getExpires()->getTimestamp(), $now->getTimestamp());
}
+ public function testSetExpiresWithImmutable()
+ {
+ $response = new Response();
+
+ $now = $this->createDateTimeImmutableNow();
+ $response->setExpires($now);
+
+ $this->assertEquals($response->getExpires()->getTimestamp(), $now->getTimestamp());
+ }
+
public function testSetLastModified()
{
$response = new Response();
@@ -676,6 +702,16 @@ public function testSetLastModified()
$this->assertNull($response->getLastModified());
}
+ public function testSetLastModifiedWithImmutable()
+ {
+ $response = new Response();
+ $response->setLastModified($this->createDateTimeImmutableNow());
+ $this->assertNotNull($response->getLastModified());
+
+ $response->setLastModified(null);
+ $this->assertNull($response->getLastModified());
+ }
+
public function testIsInvalid()
{
$response = new Response();
@@ -912,6 +948,13 @@ protected function createDateTimeNow()
return $date->setTimestamp(time());
}
+ protected function createDateTimeImmutableNow()
+ {
+ $date = new \DateTimeImmutable();
+
+ return $date->setTimestamp(time());
+ }
+
protected function provideResponse()
{
return new Response();
@@ -990,14 +1033,3 @@ public function __toString()
class DefaultResponse extends Response
{
}
-
-class ExtendedResponse extends Response
-{
- public function setLastModified(\DateTime $date = null)
- {
- }
-
- public function getDate()
- {
- }
-}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy