[HttpKernel] Account for Response::getDate() possibly returning a DateTimeImmutable

nicolas-grekas · nicolas-grekas · commit 29eaa54cd1a6 · 2023-05-13T11:29:41.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php b/src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
@@ -147,7 +147,7 @@ public function update(Response $response)
 
         if (is_numeric($this->ageDirectives['expires'])) {
             $date = clone $response->getDate();
-            $date->modify('+'.($this->ageDirectives['expires'] + $this->age).' seconds');
+            $date = $date->modify('+'.($this->ageDirectives['expires'] + $this->age).' seconds');
             $response->setExpires($date);
         }
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/ResponseCacheStrategyTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/ResponseCacheStrategyTest.php
@@ -257,7 +257,7 @@ public function testCacheControlMerging(array $expects, array $master, array $su
 
                     case 'expires':
                         $expires = clone $response->getDate();
-                        $expires->modify('+'.$value.' seconds');
+                        $expires = $expires->modify('+'.$value.' seconds');
                         $response->setExpires($expires);
                         break;
 

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public function update(Response $response)`
`147`	`147`
`148`	`148`	`if (is_numeric($this->ageDirectives['expires'])) {`
`149`	`149`	`$date = clone $response->getDate();`
`150`		`- $date->modify('+'.($this->ageDirectives['expires'] + $this->age).' seconds');`
	`150`	`+ $date = $date->modify('+'.($this->ageDirectives['expires'] + $this->age).' seconds');`
`151`	`151`	`$response->setExpires($date);`
`152`	`152`	`}`
`153`	`153`	`}`