bug #19435 [Cache] Fix incorrect timestamps generated by FilesystemAdapter (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 26dfa2f87996 · 2016-07-27T16:06:17.000+02:00
This PR was merged into the 3.1 branch. Discussion ---------- [Cache] Fix incorrect timestamps generated by FilesystemAdapter | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #19431 | License | MIT | Doc PR | - Commits ------- bd2e795 [Cache] Fix incorrect timestamps generated by FilesystemAdapter
diff --git a/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php b/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php
@@ -126,7 +126,7 @@ protected function doDelete(array $ids)
     protected function doSave(array $values, $lifetime)
     {
         $ok = true;
-        $expiresAt = $lifetime ? time() + $lifetime : PHP_INT_MAX;
+        $expiresAt = time() + ($lifetime ?: 31557600); // 31557600s = 1 year
         $tmp = $this->directory.uniqid('', true);
 
         foreach ($values as $id => $value) {

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ protected function doDelete(array $ids)`
`126`	`126`	`protected function doSave(array $values, $lifetime)`
`127`	`127`	`{`
`128`	`128`	`$ok = true;`
`129`		`- $expiresAt = $lifetime ? time() + $lifetime : PHP_INT_MAX;`
	`129`	`+ $expiresAt = time() + ($lifetime ?: 31557600); // 31557600s = 1 year`
`130`	`130`	`$tmp = $this->directory.uniqid('', true);`
`131`	`131`
`132`	`132`	`foreach ($values as $id => $value) {`