Upgrade 1-11.38

vendor/symfony/cache/CacheItem.php

@@ -11,28 +11,23 @@
 
 namespace Symfony\Component\Cache;
 
+use Psr\Cache\CacheItemInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\Exception\LogicException;
-use Symfony\Contracts\Cache\ItemInterface;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-final class CacheItem implements ItemInterface
+final class CacheItem implements CacheItemInterface
 {
-    private const METADATA_EXPIRY_OFFSET = 1527506807;
-
     protected $key;
     protected $value;
     protected $isHit = false;
     protected $expiry;
-    protected $defaultLifetime;
-    protected $metadata = [];
-    protected $newMetadata = [];
+    protected $tags = [];
+    protected $prevTags = [];
     protected $innerItem;
     protected $poolHash;
-    protected $isTaggable = false;
 
     /**
      * {@inheritdoc}
@@ -78,11 +73,11 @@ final class CacheItem implements ItemInterface
     public function expiresAt($expiration)
     {
         if (null === $expiration) {
-            $this->expiry = $this->defaultLifetime > 0 ? microtime(true) + $this->defaultLifetime : null;
+            $this->expiry = null;
         } elseif ($expiration instanceof \DateTimeInterface) {
-            $this->expiry = (float) $expiration->format('U.u');
+            $this->expiry = (int) $expiration->format('U');
         } else {
-            throw new InvalidArgumentException(sprintf('Expiration date must implement DateTimeInterface or be null, "%s" given', \is_object($expiration) ? \get_class($expiration) : \gettype($expiration)));
+            throw new InvalidArgumentException(sprintf('Expiration date must implement DateTimeInterface or be null, "%s" given.', \is_object($expiration) ? \get_class($expiration) : \gettype($expiration)));
         }
 
         return $this;
@@ -96,68 +91,59 @@ final class CacheItem implements ItemInterface
     public function expiresAfter($time)
     {
         if (null === $time) {
-            $this->expiry = $this->defaultLifetime > 0 ? microtime(true) + $this->defaultLifetime : null;
+            $this->expiry = null;
         } elseif ($time instanceof \DateInterval) {
-            $this->expiry = microtime(true) + \DateTime::createFromFormat('U', 0)->add($time)->format('U.u');
+            $this->expiry = (int) \DateTime::createFromFormat('U', time())->add($time)->format('U');
         } elseif (\is_int($time)) {
-            $this->expiry = $time + microtime(true);
+            $this->expiry = $time + time();
         } else {
-            throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given', \is_object($time) ? \get_class($time) : \gettype($time)));
+            throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', \is_object($time) ? \get_class($time) : \gettype($time)));
         }
 
         return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * Adds a tag to a cache item.
+     *
+     * @param string|string[] $tags A tag or array of tags
+     *
+     * @return $this
+     *
+     * @throws InvalidArgumentException When $tag is not valid
      */
-    public function tag($tags): ItemInterface
+    public function tag($tags)
     {
-        if (!$this->isTaggable) {
-            throw new LogicException(sprintf('Cache item "%s" comes from a non tag-aware pool: you cannot tag it.', $this->key));
-        }
-        if (!is_iterable($tags)) {
+        if (!\is_array($tags)) {
             $tags = [$tags];
         }
         foreach ($tags as $tag) {
             if (!\is_string($tag)) {
-                throw new InvalidArgumentException(sprintf('Cache tag must be string, "%s" given', \is_object($tag) ? \get_class($tag) : \gettype($tag)));
+                throw new InvalidArgumentException(sprintf('Cache tag must be string, "%s" given.', \is_object($tag) ? \get_class($tag) : \gettype($tag)));
             }
-            if (isset($this->newMetadata[self::METADATA_TAGS][$tag])) {
+            if (isset($this->tags[$tag])) {
                 continue;
             }
             if ('' === $tag) {
-                throw new InvalidArgumentException('Cache tag length must be greater than zero');
+                throw new InvalidArgumentException('Cache tag length must be greater than zero.');
             }
             if (false !== strpbrk($tag, '{}()/\@:')) {
-                throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters {}()/\@:', $tag));
+                throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters {}()/\@:.', $tag));
             }
-            $this->newMetadata[self::METADATA_TAGS][$tag] = $tag;
+            $this->tags[$tag] = $tag;
         }
 
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata(): array
-    {
-        return $this->metadata;
-    }
-
     /**
      * Returns the list of tags bound to the value coming from the pool storage if any.
      *
      * @return array
-     *
-     * @deprecated since Symfony 4.2, use the "getMetadata()" method instead.
      */
     public function getPreviousTags()
     {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2, use the "getMetadata()" method instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->metadata[self::METADATA_TAGS] ?? [];
+        return $this->prevTags;
     }
 
     /**
@@ -172,13 +158,13 @@ final class CacheItem implements ItemInterface
     public static function validateKey($key)
     {
         if (!\is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given', \is_object($key) ? \get_class($key) : \gettype($key)));
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
         }
         if ('' === $key) {
-            throw new InvalidArgumentException('Cache key length must be greater than zero');
+            throw new InvalidArgumentException('Cache key length must be greater than zero.');
         }
         if (false !== strpbrk($key, '{}()/\@:')) {
-            throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:', $key));
+            throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:.', $key));
         }
 
         return $key;
@@ -200,7 +186,7 @@ final class CacheItem implements ItemInterface
                     $replace['{'.$k.'}'] = $v;
                 }
             }
-            @trigger_error(strtr($message, $replace), E_USER_WARNING);
+            @trigger_error(strtr($message, $replace), \E_USER_WARNING);
         }
     }
 }