Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit f73b98559fb0 · 2021-07-07T14:44:15.000+02:00
* 5.2:
  [Cache] fix bad merge
diff --git a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
@@ -306,7 +306,7 @@ public function reset()
         $this->clear();
     }
 
-    private function generateItems(array $keys, float $now, \Closure $f)
+    private function generateItems(array $keys, float $now, \Closure $f): \Generator
     {
         foreach ($keys as $i => $key) {
             if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] > $now || !$this->deleteItem($key))) {
diff --git a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
@@ -150,7 +150,7 @@ public function getItems(array $keys = [])
         return $this->generateItems($this->adapters[0]->getItems($keys), 0);
     }
 
-    private function generateItems(iterable $items, int $adapterIndex)
+    private function generateItems(iterable $items, int $adapterIndex): \Generator
     {
         $missing = [];
         $misses = [];
diff --git a/src/Symfony/Component/Cache/Adapter/NullAdapter.php b/src/Symfony/Component/Cache/Adapter/NullAdapter.php
@@ -141,7 +141,7 @@ public function delete(string $key): bool
         return $this->deleteItem($key);
     }
 
-    private function generateItems(array $keys)
+    private function generateItems(array $keys): \Generator
     {
         $f = self::$createCacheItem;
 
diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
@@ -246,7 +246,7 @@ private function doSave(CacheItemInterface $item, string $method)
         return $this->pool->$method($innerItem);
     }
 
-    private function generateItems(iterable $items)
+    private function generateItems(iterable $items): \Generator
     {
         $f = self::$createCacheItem;
 
diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -328,7 +328,7 @@ public function __destruct()
         $this->commit();
     }
 
-    private function generateItems(iterable $items, array $tagKeys)
+    private function generateItems(iterable $items, array $tagKeys): \Generator
     {
         $bufferedItems = $itemTags = [];
         $f = self::$setCacheItemTags;
diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php
@@ -76,9 +76,15 @@ public function set($value): self
      *
      * @return $this
      */
-    public function expiresAt(?\DateTimeInterface $expiration): self
+    public function expiresAt($expiration): self
     {
-        $this->expiry = null !== $expiration ? (float) $expiration->format('U.u') : null;
+        if (null === $expiration) {
+            $this->expiry = null;
+        } elseif ($expiration instanceof \DateTimeInterface) {
+            $this->expiry = (float) $expiration->format('U.u');
+        } else {
+            throw new InvalidArgumentException(sprintf('Expiration date must implement DateTimeInterface or be null, "%s" given.', get_debug_type($expiration)));
+        }
 
         return $this;
     }
diff --git a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
@@ -332,7 +332,7 @@ public function __destruct()
         }
     }
 
-    private function generateItems(iterable $items, array &$keys): iterable
+    private function generateItems(iterable $items, array &$keys): \Generator
     {
         $f = self::$createCacheItem;
 
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -84,9 +84,9 @@ private function init($redis, string $namespace, int $defaultLifetime, ?Marshall
      *
      * @param array $options See self::$defaultConnectionOptions
      *
-     * @throws InvalidArgumentException when the DSN is invalid
-     *
      * @return \Redis|\RedisCluster|RedisClusterProxy|RedisProxy|\Predis\ClientInterface According to the "class" option
+     *
+     * @throws InvalidArgumentException when the DSN is invalid
      */
     public static function createConnection(string $dsn, array $options = [])
     {

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ public function reset()`
`306`	`306`	`$this->clear();`
`307`	`307`	`}`
`308`	`308`
`309`		`- private function generateItems(array $keys, float $now, \Closure $f)`
	`309`	`+ private function generateItems(array $keys, float $now, \Closure $f): \Generator`
`310`	`310`	`{`
`311`	`311`	`foreach ($keys as $i => $key) {`
`312`	`312`	`if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] > $now \|\| !$this->deleteItem($key))) {`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public function getItems(array $keys = [])`
`150`	`150`	`return $this->generateItems($this->adapters[0]->getItems($keys), 0);`
`151`	`151`	`}`
`152`	`152`
`153`		`- private function generateItems(iterable $items, int $adapterIndex)`
	`153`	`+ private function generateItems(iterable $items, int $adapterIndex): \Generator`
`154`	`154`	`{`
`155`	`155`	`$missing = [];`
`156`	`156`	`$misses = [];`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function delete(string $key): bool`
`141`	`141`	`return $this->deleteItem($key);`
`142`	`142`	`}`
`143`	`143`
`144`		`- private function generateItems(array $keys)`
	`144`	`+ private function generateItems(array $keys): \Generator`
`145`	`145`	`{`
`146`	`146`	`$f = self::$createCacheItem;`
`147`	`147`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ private function doSave(CacheItemInterface $item, string $method)`
`246`	`246`	`return $this->pool->$method($innerItem);`
`247`	`247`	`}`
`248`	`248`
`249`		`- private function generateItems(iterable $items)`
	`249`	`+ private function generateItems(iterable $items): \Generator`
`250`	`250`	`{`
`251`	`251`	`$f = self::$createCacheItem;`
`252`	`252`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ public function __destruct()`
`328`	`328`	`$this->commit();`
`329`	`329`	`}`
`330`	`330`
`331`		`- private function generateItems(iterable $items, array $tagKeys)`
	`331`	`+ private function generateItems(iterable $items, array $tagKeys): \Generator`
`332`	`332`	`{`
`333`	`333`	`$bufferedItems = $itemTags = [];`
`334`	`334`	`$f = self::$setCacheItemTags;`
Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,15 @@ public function set($value): self`
`76`	`76`	`*`
`77`	`77`	`* @return $this`
`78`	`78`	`*/`
`79`		`- public function expiresAt(?\DateTimeInterface $expiration): self`
	`79`	`+ public function expiresAt($expiration): self`
`80`	`80`	`{`
`81`		`- $this->expiry = null !== $expiration ? (float) $expiration->format('U.u') : null;`
	`81`	`+ if (null === $expiration) {`
	`82`	`+ $this->expiry = null;`
	`83`	`+ } elseif ($expiration instanceof \DateTimeInterface) {`
	`84`	`+ $this->expiry = (float) $expiration->format('U.u');`
	`85`	`+ } else {`
	`86`	`+ throw new InvalidArgumentException(sprintf('Expiration date must implement DateTimeInterface or be null, "%s" given.', get_debug_type($expiration)));`
	`87`	`+ }`
`82`	`88`
`83`	`89`	`return $this;`
`84`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ public function __destruct()`
`332`	`332`	`}`
`333`	`333`	`}`
`334`	`334`
`335`		`- private function generateItems(iterable $items, array &$keys): iterable`
	`335`	`+ private function generateItems(iterable $items, array &$keys): \Generator`
`336`	`336`	`{`
`337`	`337`	`$f = self::$createCacheItem;`
`338`	`338`
Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,9 @@ private function init($redis, string $namespace, int $defaultLifetime, ?Marshall`
`84`	`84`	`*`
`85`	`85`	`* @param array $options See self::$defaultConnectionOptions`
`86`	`86`	`*`
`87`		`- * @throws InvalidArgumentException when the DSN is invalid`
`88`		`- *`
`89`	`87`	`* @return \Redis\|\RedisCluster\|RedisClusterProxy\|RedisProxy\|\Predis\ClientInterface According to the "class" option`
	`88`	`+ *`
	`89`	`+ * @throws InvalidArgumentException when the DSN is invalid`
`90`	`90`	`*/`
`91`	`91`	`public static function createConnection(string $dsn, array $options = [])`
`92`	`92`	`{`