Merge branch '5.1'

nicolas-grekas · nicolas-grekas · commit ba4d57bb5fc0 · 2020-07-13T11:17:24.000+02:00
* 5.1:
  [Cache] fix merge
diff --git a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
@@ -205,7 +205,7 @@ public function save(CacheItemInterface $item)
             return false;
         }
         if (null === $expiry && 0 < $this->defaultLifetime) {
-            $expiry = microtime(true) + $this->defaultLifetime;
+            $expiry = $this->defaultLifetime;
             $expiry = $now + ($expiry > ($this->maxLifetime ?: $expiry) ? $this->maxLifetime : $expiry);
         } elseif ($this->maxLifetime && (null === $expiry || $expiry > $now + $this->maxLifetime)) {
             $expiry = $now + $this->maxLifetime;

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public function save(CacheItemInterface $item)`
`205`	`205`	`return false;`
`206`	`206`	`}`
`207`	`207`	`if (null === $expiry && 0 < $this->defaultLifetime) {`
`208`		`- $expiry = microtime(true) + $this->defaultLifetime;`
	`208`	`+ $expiry = $this->defaultLifetime;`
`209`	`209`	`$expiry = $now + ($expiry > ($this->maxLifetime ?: $expiry) ? $this->maxLifetime : $expiry);`
`210`	`210`	`} elseif ($this->maxLifetime && (null === $expiry \|\| $expiry > $now + $this->maxLifetime)) {`
`211`	`211`	`$expiry = $now + $this->maxLifetime;`