grommunio / grommunio-web

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Core/Item/TaggableCacheItemTrait.php

Indentation +99 added lines, -99 removed lines

@@ -26,103 +26,103 @@
  */
 trait TaggableCacheItemTrait
 {
-    /**
-     * @param array $tagNames
-     * @return ExtendedCacheItemInterface
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    public function addTags(array $tagNames): ExtendedCacheItemInterface
-    {
-        foreach ($tagNames as $tagName) {
-            $this->addTag($tagName);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param $tagName
-     * @return ExtendedCacheItemInterface
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    public function addTag(string $tagName): ExtendedCacheItemInterface
-    {
-        if (\is_string($tagName)) {
-            $this->tags = \array_unique(\array_merge($this->tags, [$tagName]));
-
-            return $this;
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('$tagName must be a string');
-    }
-
-    /**
-     * @param array $tags
-     * @return ExtendedCacheItemInterface
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    public function setTags(array $tags): ExtendedCacheItemInterface
-    {
-        if (\count($tags)) {
-            if (\array_filter($tags, 'is_string')) {
-                $this->tags = $tags;
-            } else {
-                throw new PhpfastcacheInvalidArgumentException('$tagName must be an array of string');
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getTags(): array
-    {
-        return $this->tags;
-    }
-
-    /**
-     * @param string $separator
-     * @return string
-     */
-    public function getTagsAsString(string $separator = ', '): string
-    {
-        return \implode($separator, $this->tags);
-    }
-
-    /**
-     * @param array $tagNames
-     * @return ExtendedCacheItemInterface
-     */
-    public function removeTags(array $tagNames): ExtendedCacheItemInterface
-    {
-        foreach ($tagNames as $tagName) {
-            $this->removeTag($tagName);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param $tagName
-     * @return ExtendedCacheItemInterface
-     */
-    public function removeTag(string $tagName): ExtendedCacheItemInterface
-    {
-        if (($key = \array_search($tagName, $this->tags, true)) !== false) {
-            unset($this->tags[$key]);
-            $this->removedTags[] = $tagName;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getRemovedTags(): array
-    {
-        return \array_diff($this->removedTags, $this->tags);
-    }
+	/**
+	 * @param array $tagNames
+	 * @return ExtendedCacheItemInterface
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	public function addTags(array $tagNames): ExtendedCacheItemInterface
+	{
+		foreach ($tagNames as $tagName) {
+			$this->addTag($tagName);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @param $tagName
+	 * @return ExtendedCacheItemInterface
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	public function addTag(string $tagName): ExtendedCacheItemInterface
+	{
+		if (\is_string($tagName)) {
+			$this->tags = \array_unique(\array_merge($this->tags, [$tagName]));
+
+			return $this;
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('$tagName must be a string');
+	}
+
+	/**
+	 * @param array $tags
+	 * @return ExtendedCacheItemInterface
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	public function setTags(array $tags): ExtendedCacheItemInterface
+	{
+		if (\count($tags)) {
+			if (\array_filter($tags, 'is_string')) {
+				$this->tags = $tags;
+			} else {
+				throw new PhpfastcacheInvalidArgumentException('$tagName must be an array of string');
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getTags(): array
+	{
+		return $this->tags;
+	}
+
+	/**
+	 * @param string $separator
+	 * @return string
+	 */
+	public function getTagsAsString(string $separator = ', '): string
+	{
+		return \implode($separator, $this->tags);
+	}
+
+	/**
+	 * @param array $tagNames
+	 * @return ExtendedCacheItemInterface
+	 */
+	public function removeTags(array $tagNames): ExtendedCacheItemInterface
+	{
+		foreach ($tagNames as $tagName) {
+			$this->removeTag($tagName);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @param $tagName
+	 * @return ExtendedCacheItemInterface
+	 */
+	public function removeTag(string $tagName): ExtendedCacheItemInterface
+	{
+		if (($key = \array_search($tagName, $this->tags, true)) !== false) {
+			unset($this->tags[$key]);
+			$this->removedTags[] = $tagName;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getRemovedTags(): array
+	{
+		return \array_diff($this->removedTags, $this->tags);
+	}
 }

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Core/Item/ItemBaseTrait.php

Indentation +177 added lines, -177 removed lines

@@ -29,186 +29,186 @@
  */
 trait ItemBaseTrait
 {
-    use ItemExtendedTrait;
-    use EventManagerDispatcherTrait;
-
-    /**
-     * @var bool
-     */
-    protected $fetched = false;
-
-    /**
-     * @var string
-     */
-    protected $key;
-
-    /**
-     * @var mixed
-     */
-    protected $data;
-
-    /**
-     * @var DateTimeInterface
-     */
-    protected $expirationDate;
-
-    /**
-     * @var DateTimeInterface
-     */
-    protected $creationDate;
-
-    /**
-     * @var DateTimeInterface
-     */
-    protected $modificationDate;
-
-    /**
-     * @var array
-     */
-    protected $tags = [];
-
-    /**
-     * @var array
-     */
-    protected $removedTags = [];
-
-    /**
-     * @var bool
-     */
-    protected $isHit = false;
-
-    /********************
+	use ItemExtendedTrait;
+	use EventManagerDispatcherTrait;
+
+	/**
+	 * @var bool
+	 */
+	protected $fetched = false;
+
+	/**
+	 * @var string
+	 */
+	protected $key;
+
+	/**
+	 * @var mixed
+	 */
+	protected $data;
+
+	/**
+	 * @var DateTimeInterface
+	 */
+	protected $expirationDate;
+
+	/**
+	 * @var DateTimeInterface
+	 */
+	protected $creationDate;
+
+	/**
+	 * @var DateTimeInterface
+	 */
+	protected $modificationDate;
+
+	/**
+	 * @var array
+	 */
+	protected $tags = [];
+
+	/**
+	 * @var array
+	 */
+	protected $removedTags = [];
+
+	/**
+	 * @var bool
+	 */
+	protected $isHit = false;
+
+	/********************
      *
      * PSR-6 Methods
      *
      *******************/
 
-    /**
-     * @return string
-     */
-    public function getKey()
-    {
-        return $this->key;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function get()
-    {
-        return $this->data;
-    }
-
-    /**
-     * @param mixed $value
-     * @return $this
-     */
-    public function set($value)
-    {
-        /**
-         * The user set a value,
-         * therefore there is no need to
-         * fetch from source anymore
-         */
-        $this->fetched = true;
-        $this->data = $value;
-
-        /**
-         * @eventName CacheSaveDeferredItem
-         * @param ExtendedCacheItemInterface $this
-         * @param mixed $value
-         *
-         */
-        $this->eventManager->dispatch('CacheItemSet', $this, $value);
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isHit(): bool
-    {
-        return $this->isHit;
-    }
-
-    /**
-     * @param bool $isHit
-     * @return ExtendedCacheItemInterface
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    public function setHit($isHit): ExtendedCacheItemInterface
-    {
-        if (\is_bool($isHit)) {
-            $this->isHit = $isHit;
-
-            return $this;
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('$isHit must be a boolean');
-    }
-
-    /**
-     * @param DateTimeInterface $expiration
-     * @return ExtendedCacheItemInterface
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    public function expiresAt($expiration): ExtendedCacheItemInterface
-    {
-        if ($expiration instanceof DateTimeInterface) {
-            /**
-             * @eventName CacheItemExpireAt
-             * @param ExtendedCacheItemInterface $this
-             * @param DateTimeInterface $expiration
-             */
-            $this->eventManager->dispatch('CacheItemExpireAt', $this, $expiration);
-            $this->expirationDate = $expiration;
-        } else {
-            throw new PhpfastcacheInvalidArgumentException('$expiration must be an object implementing the DateTimeInterface got: ' . \gettype($expiration));
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param DateInterval|int $time
-     * @return $this
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    public function expiresAfter($time)
-    {
-        if (\is_numeric($time)) {
-            if ($time <= 0) {
-                /**
-                 * 5 years, however memcached or memory cached will gone when u restart it
-                 * just recommended for sqlite. files
-                 */
-                $time = 30 * 24 * 3600 * 5;
-            }
-
-            /**
-             * @eventName CacheItemExpireAt
-             * @param ExtendedCacheItemInterface $this
-             * @param DateTimeInterface $expiration
-             */
-            $this->eventManager->dispatch('CacheItemExpireAfter', $this, $time);
-
-            $this->expirationDate = (new DateTime())->add(new DateInterval(\sprintf('PT%dS', $time)));
-        } else {
-            if ($time instanceof DateInterval) {
-                /**
-                 * @eventName CacheItemExpireAt
-                 * @param ExtendedCacheItemInterface $this
-                 * @param DateTimeInterface $expiration
-                 */
-                $this->eventManager->dispatch('CacheItemExpireAfter', $this, $time);
-
-                $this->expirationDate = (new DateTime())->add($time);
-            } else {
-                throw new PhpfastcacheInvalidArgumentException(\sprintf('Invalid date format, got "%s"', \gettype($time)));
-            }
-        }
-
-        return $this;
-    }
+	/**
+	 * @return string
+	 */
+	public function getKey()
+	{
+		return $this->key;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function get()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return $this
+	 */
+	public function set($value)
+	{
+		/**
+		 * The user set a value,
+		 * therefore there is no need to
+		 * fetch from source anymore
+		 */
+		$this->fetched = true;
+		$this->data = $value;
+
+		/**
+		 * @eventName CacheSaveDeferredItem
+		 * @param ExtendedCacheItemInterface $this
+		 * @param mixed $value
+		 *
+		 */
+		$this->eventManager->dispatch('CacheItemSet', $this, $value);
+
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isHit(): bool
+	{
+		return $this->isHit;
+	}
+
+	/**
+	 * @param bool $isHit
+	 * @return ExtendedCacheItemInterface
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	public function setHit($isHit): ExtendedCacheItemInterface
+	{
+		if (\is_bool($isHit)) {
+			$this->isHit = $isHit;
+
+			return $this;
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('$isHit must be a boolean');
+	}
+
+	/**
+	 * @param DateTimeInterface $expiration
+	 * @return ExtendedCacheItemInterface
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	public function expiresAt($expiration): ExtendedCacheItemInterface
+	{
+		if ($expiration instanceof DateTimeInterface) {
+			/**
+			 * @eventName CacheItemExpireAt
+			 * @param ExtendedCacheItemInterface $this
+			 * @param DateTimeInterface $expiration
+			 */
+			$this->eventManager->dispatch('CacheItemExpireAt', $this, $expiration);
+			$this->expirationDate = $expiration;
+		} else {
+			throw new PhpfastcacheInvalidArgumentException('$expiration must be an object implementing the DateTimeInterface got: ' . \gettype($expiration));
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @param DateInterval|int $time
+	 * @return $this
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	public function expiresAfter($time)
+	{
+		if (\is_numeric($time)) {
+			if ($time <= 0) {
+				/**
+				 * 5 years, however memcached or memory cached will gone when u restart it
+				 * just recommended for sqlite. files
+				 */
+				$time = 30 * 24 * 3600 * 5;
+			}
+
+			/**
+			 * @eventName CacheItemExpireAt
+			 * @param ExtendedCacheItemInterface $this
+			 * @param DateTimeInterface $expiration
+			 */
+			$this->eventManager->dispatch('CacheItemExpireAfter', $this, $time);
+
+			$this->expirationDate = (new DateTime())->add(new DateInterval(\sprintf('PT%dS', $time)));
+		} else {
+			if ($time instanceof DateInterval) {
+				/**
+				 * @eventName CacheItemExpireAt
+				 * @param ExtendedCacheItemInterface $this
+				 * @param DateTimeInterface $expiration
+				 */
+				$this->eventManager->dispatch('CacheItemExpireAfter', $this, $time);
+
+				$this->expirationDate = (new DateTime())->add($time);
+			} else {
+				throw new PhpfastcacheInvalidArgumentException(\sprintf('Invalid date format, got "%s"', \gettype($time)));
+			}
+		}
+
+		return $this;
+	}
 }

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Core/Pool/ExtendedCacheItemPoolTrait.php

Indentation +125 added lines, -125 removed lines

@@ -27,129 +27,129 @@
  */
 trait ExtendedCacheItemPoolTrait
 {
-    use CacheItemPoolTrait;
-    use AbstractDriverPoolTrait;
-
-    /**
-     * @var DriverIO
-     */
-    protected $IO;
-
-    /**
-     * @inheritdoc
-     */
-    public function getItemsAsJsonString(array $keys = [], int $option = 0, int $depth = 512): string
-    {
-        $callback = static function (CacheItemInterface $item) {
-            return $item->get();
-        };
-        return \json_encode(\array_map($callback, \array_values($this->getItems($keys))), $option, $depth);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function detachAllItems()
-    {
-        foreach ($this->itemInstances as $item) {
-            $this->detachItem($item);
-        }
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return void
-     */
-    public function detachItem(CacheItemInterface $item)
-    {
-        if (isset($this->itemInstances[$item->getKey()])) {
-            $this->deregisterItem($item->getKey());
-        }
-    }
-
-    /**
-     * @param string $item
-     * @internal This method de-register an item from $this->itemInstances
-     */
-    protected function deregisterItem(string $item)
-    {
-        unset($this->itemInstances[$item]);
-
-        if (\gc_enabled()) {
-            \gc_collect_cycles();
-        }
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attachItem(CacheItemInterface $item)
-    {
-        if (isset($this->itemInstances[$item->getKey()]) && \spl_object_hash($item) !== \spl_object_hash($this->itemInstances[$item->getKey()])) {
-            throw new PhpfastcacheLogicException(
-                'The item already exists and cannot be overwritten because the Spl object hash mismatches ! You probably tried to re-attach a detached item which has been already retrieved from cache.'
-            );
-        }
-
-        if(!$this->getConfig()->isUseStaticItemCaching()){
-            throw new PhpfastcacheLogicException(
-                'The static item caching option (useStaticItemCaching) is disabled so you cannot attach an item.'
-            );
-        }
-
-        $this->itemInstances[$item->getKey()] = $item;
-    }
-
-    /**
-     * Returns true if the item exists, is attached and the Spl Hash matches
-     * Returns false if the item exists, is attached and the Spl Hash mismatches
-     * Returns null if the item does not exists
-     *
-     * @param CacheItemInterface $item
-     * @return bool|null
-     */
-    public function isAttached(CacheItemInterface $item)
-    {
-        if (isset($this->itemInstances[$item->getKey()])) {
-            return \spl_object_hash($item) === \spl_object_hash($this->itemInstances[$item->getKey()]);
-        }
-        return null;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function saveMultiple(...$items): bool
-    {
-        if (isset($items[0]) && \is_array($items[0])) {
-            foreach ($items[0] as $item) {
-                $this->save($item);
-            }
-            return true;
-        }
-
-        if (\is_array($items)) {
-            foreach ($items as $item) {
-                $this->save($item);
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @return DriverIO
-     */
-    public function getIO(): DriverIO
-    {
-        return $this->IO;
-    }
-
-    /**
-     * @return string
-     */
-    public function getHelp(): string
-    {
-        return '';
-    }
+	use CacheItemPoolTrait;
+	use AbstractDriverPoolTrait;
+
+	/**
+	 * @var DriverIO
+	 */
+	protected $IO;
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getItemsAsJsonString(array $keys = [], int $option = 0, int $depth = 512): string
+	{
+		$callback = static function (CacheItemInterface $item) {
+			return $item->get();
+		};
+		return \json_encode(\array_map($callback, \array_values($this->getItems($keys))), $option, $depth);
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function detachAllItems()
+	{
+		foreach ($this->itemInstances as $item) {
+			$this->detachItem($item);
+		}
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return void
+	 */
+	public function detachItem(CacheItemInterface $item)
+	{
+		if (isset($this->itemInstances[$item->getKey()])) {
+			$this->deregisterItem($item->getKey());
+		}
+	}
+
+	/**
+	 * @param string $item
+	 * @internal This method de-register an item from $this->itemInstances
+	 */
+	protected function deregisterItem(string $item)
+	{
+		unset($this->itemInstances[$item]);
+
+		if (\gc_enabled()) {
+			\gc_collect_cycles();
+		}
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function attachItem(CacheItemInterface $item)
+	{
+		if (isset($this->itemInstances[$item->getKey()]) && \spl_object_hash($item) !== \spl_object_hash($this->itemInstances[$item->getKey()])) {
+			throw new PhpfastcacheLogicException(
+				'The item already exists and cannot be overwritten because the Spl object hash mismatches ! You probably tried to re-attach a detached item which has been already retrieved from cache.'
+			);
+		}
+
+		if(!$this->getConfig()->isUseStaticItemCaching()){
+			throw new PhpfastcacheLogicException(
+				'The static item caching option (useStaticItemCaching) is disabled so you cannot attach an item.'
+			);
+		}
+
+		$this->itemInstances[$item->getKey()] = $item;
+	}
+
+	/**
+	 * Returns true if the item exists, is attached and the Spl Hash matches
+	 * Returns false if the item exists, is attached and the Spl Hash mismatches
+	 * Returns null if the item does not exists
+	 *
+	 * @param CacheItemInterface $item
+	 * @return bool|null
+	 */
+	public function isAttached(CacheItemInterface $item)
+	{
+		if (isset($this->itemInstances[$item->getKey()])) {
+			return \spl_object_hash($item) === \spl_object_hash($this->itemInstances[$item->getKey()]);
+		}
+		return null;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function saveMultiple(...$items): bool
+	{
+		if (isset($items[0]) && \is_array($items[0])) {
+			foreach ($items[0] as $item) {
+				$this->save($item);
+			}
+			return true;
+		}
+
+		if (\is_array($items)) {
+			foreach ($items as $item) {
+				$this->save($item);
+			}
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @return DriverIO
+	 */
+	public function getIO(): DriverIO
+	{
+		return $this->IO;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getHelp(): string
+	{
+		return '';
+	}
 }

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Core/Pool/TaggableCacheItemPoolTrait.php

Indentation +383 added lines, -383 removed lines

@@ -29,387 +29,387 @@
  */
 trait TaggableCacheItemPoolTrait
 {
-    /**
-     * @inheritdoc
-     */
-    public function getItemsByTagsAsJsonString(array $tagNames, int $option = 0, int $depth = 512, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): string
-    {
-        $callback = static function (CacheItemInterface $item) {
-            return $item->get();
-        };
-
-        return \json_encode(\array_map($callback, \array_values($this->getItemsByTags($tagNames, $strategy))), $option, $depth);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getItemsByTags(array $tagNames, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): array
-    {
-        $items = [];
-        foreach (\array_unique($tagNames) as $tagName) {
-            if (\is_string($tagName)) {
-                $items[] = $this->fetchItemsByTagFromBackend($tagName);
-            } else {
-                throw new PhpfastcacheInvalidArgumentException('$tagName must be a a string');
-            }
-        }
-
-        $items = \array_merge([], ...$items);
-
-        switch ($strategy) {
-            case TaggableCacheItemPoolInterface::TAG_STRATEGY_ALL:
-                foreach ($items as $key => $item) {
-                    if (\array_diff($tagNames, $item->getTags())) {
-                        unset($items[$key]);
-                    }
-                }
-                break;
-
-            case TaggableCacheItemPoolInterface::TAG_STRATEGY_ONLY:
-                foreach ($items as $key => $item) {
-                    if (\array_diff($tagNames, $item->getTags()) || \array_diff($item->getTags(), $tagNames)) {
-                        unset($items[$key]);
-                    }
-                }
-                break;
-        }
-        return $items;
-    }
-
-    /**
-     * @param string $tagName
-     * @return array
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    protected function fetchItemsByTagFromBackend(string $tagName): array
-    {
-        if (\is_string($tagName)) {
-            $driverResponse = $this->getItem($this->getTagKey($tagName));
-            if ($driverResponse->isHit()) {
-                $tagsItems = (array)$driverResponse->get();
-
-                /**
-                 * getItems() may provides expired item(s)
-                 * themselves provided by a cache of item
-                 * keys based stored the tag item.
-                 * Therefore we pass a filter callback
-                 * to remove the expired Item(s) provided by
-                 * the item keys passed through getItems()
-                 *
-                 * #headache
-                 */
-                return \array_filter(
-                    $this->getItems(\array_unique(\array_keys($tagsItems))),
-                    static function (ExtendedCacheItemInterface $item) {
-                        return $item->isHit();
-                    }
-                );
-            }
-            return [];
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('$tagName must be a string');
-    }
-
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function getTagKey(string $key): string
-    {
-        return self::DRIVER_TAGS_KEY_PREFIX . $key;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function deleteItemsByTags(array $tagNames, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
-    {
-        $return = null;
-
-        foreach ($this->getItemsByTags($tagNames, $strategy) as $item) {
-            $result = $this->deleteItem($item->getKey());
-            if ($return !== false) {
-                $return = $result;
-            }
-        }
-
-        return (bool)$return;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function deleteItemsByTag(string $tagName, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
-    {
-        if (\is_string($tagName)) {
-            $return = null;
-            foreach ($this->getItemsByTag($tagName, $strategy) as $item) {
-                $result = $this->deleteItem($item->getKey());
-                if ($return !== false) {
-                    $return = $result;
-                }
-            }
-
-            return (bool)$return;
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('$tagName must be a string');
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getItemsByTag(string $tagName, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): array
-    {
-        $items = $this->fetchItemsByTagFromBackend($tagName);
-        if ($strategy === TaggableCacheItemPoolInterface::TAG_STRATEGY_ONLY) {
-            foreach ($items as $key => $item) {
-                if (\array_diff($item->getTags(), $tagName)) {
-                    unset($items[$key]);
-                }
-            }
-        }
-        return $items;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function incrementItemsByTags(array $tagNames, int $step = 1, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
-    {
-        $return = null;
-        foreach ($tagNames as $tagName) {
-            $result = $this->incrementItemsByTag($tagName, $step, $strategy);
-            if ($return !== false) {
-                $return = $result;
-            }
-        }
-
-        return (bool)$return;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function incrementItemsByTag(string $tagName, int $step = 1, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
-    {
-        if (\is_string($tagName) && \is_int($step)) {
-            foreach ($this->getItemsByTag($tagName, $strategy) as $item) {
-                $item->increment($step);
-                $this->saveDeferred($item);
-            }
-
-            return (bool)$this->commit();
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('$tagName must be a string and $step an integer');
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function decrementItemsByTags(array $tagNames, int $step = 1, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
-    {
-        $return = null;
-        foreach ($tagNames as $tagName) {
-            $result = $this->decrementItemsByTag($tagName, $step, $strategy);
-            if ($return !== false) {
-                $return = $result;
-            }
-        }
-
-        return (bool)$return;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function decrementItemsByTag(string $tagName, int $step = 1, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
-    {
-        if (\is_string($tagName) && \is_int($step)) {
-            foreach ($this->getItemsByTag($tagName, $strategy) as $item) {
-                $item->decrement($step);
-                $this->saveDeferred($item);
-            }
-
-            return (bool)$this->commit();
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('$tagName must be a string and $step an integer');
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function appendItemsByTags(array $tagNames, $data, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
-    {
-        $return = null;
-        foreach ($tagNames as $tagName) {
-            $result = $this->appendItemsByTag($tagName, $data, $strategy);
-            if ($return !== false) {
-                $return = $result;
-            }
-        }
-
-        return (bool)$return;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function appendItemsByTag(string $tagName, $data, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
-    {
-        if (\is_string($tagName)) {
-            foreach ($this->getItemsByTag($tagName, $strategy) as $item) {
-                $item->append($data);
-                $this->saveDeferred($item);
-            }
-
-            return (bool)$this->commit();
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('$tagName must be a string');
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function prependItemsByTags(array $tagNames, $data, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
-    {
-        $return = null;
-        foreach ($tagNames as $tagName) {
-            $result = $this->prependItemsByTag($tagName, $data, $strategy);
-            if ($return !== false) {
-                $return = $result;
-            }
-        }
-
-        return (bool)$return;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function prependItemsByTag(string $tagName, $data, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
-    {
-        if (\is_string($tagName)) {
-            foreach ($this->getItemsByTag($tagName, $strategy) as $item) {
-                $item->prepend($data);
-                $this->saveDeferred($item);
-            }
-
-            return (bool)$this->commit();
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('$tagName must be a string');
-    }
-
-    /**
-     * @param array $wrapper
-     * @return mixed
-     */
-    protected function driverUnwrapTags(array $wrapper)
-    {
-        return $wrapper[self::DRIVER_TAGS_WRAPPER_INDEX];
-    }
-
-    /**
-     * @param ExtendedCacheItemInterface $item
-     * @throws PhpfastcacheInvalidArgumentException
-     * @throws PhpfastcacheLogicException
-     */
-    protected function cleanItemTags(ExtendedCacheItemInterface $item)
-    {
-        $this->driverWriteTags($item->removeTags($item->getTags()));
-    }
-
-    /**
-     * @param ExtendedCacheItemInterface $item
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     * @throws PhpfastcacheLogicException
-     */
-    protected function driverWriteTags(ExtendedCacheItemInterface $item): bool
-    {
-        /**
-         * Do not attempt to write tags
-         * on tags item, it can leads
-         * to an infinite recursive calls
-         */
-        if (\strpos($item->getKey(), self::DRIVER_TAGS_KEY_PREFIX) === 0) {
-            throw new PhpfastcacheLogicException('Trying to set tag(s) to an Tag item index: ' . $item->getKey());
-        }
-
-        if (!$item->getTags() && !$item->getRemovedTags()) {
-            return true;
-        }
-
-        /**
-         * @var $tagsItems ExtendedCacheItemInterface[]
-         */
-        $tagsItems = $this->getItems($this->getTagKeys($item->getTags()));
-
-        foreach ($tagsItems as $tagsItem) {
-            $data = $tagsItem->get();
-            $expTimestamp = $item->getExpirationDate()->getTimestamp();
-
-            /**
-             * Using the key will
-             * avoid to use array_unique
-             * that has slow performances
-             */
-
-            $tagsItem->set(\array_merge((array)$data, [$item->getKey() => $expTimestamp]))
-                ->expiresAt($item->getExpirationDate());
-
-            $this->driverWrite($tagsItem);
-            $tagsItem->setHit(true);
-        }
-
-        /**
-         * Also update removed tags to
-         * keep the index up to date
-         */
-        $tagsItems = $this->getItems($this->getTagKeys($item->getRemovedTags()));
-
-        foreach ($tagsItems as $tagsItem) {
-            $data = (array)$tagsItem->get();
-
-            unset($data[$item->getKey()]);
-            $tagsItem->set($data);
-
-            /**
-             * Recalculate the expiration date
-             *
-             * If the $tagsItem does not have
-             * any cache item references left
-             * then remove it from tagsItems index
-             */
-            if (\count($data)) {
-                $tagsItem->expiresAt((new DateTime())->setTimestamp(max($data)));
-                $this->driverWrite($tagsItem);
-                $tagsItem->setHit(true);
-            } else {
-                $this->deleteItem($tagsItem->getKey());
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * @param array $keys
-     * @return array
-     */
-    protected function getTagKeys(array $keys): array
-    {
-        return \array_map(
-            function (string $key) {
-                return $this->getTagKey($key);
-            },
-            $keys
-        );
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function getItemsByTagsAsJsonString(array $tagNames, int $option = 0, int $depth = 512, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): string
+	{
+		$callback = static function (CacheItemInterface $item) {
+			return $item->get();
+		};
+
+		return \json_encode(\array_map($callback, \array_values($this->getItemsByTags($tagNames, $strategy))), $option, $depth);
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getItemsByTags(array $tagNames, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): array
+	{
+		$items = [];
+		foreach (\array_unique($tagNames) as $tagName) {
+			if (\is_string($tagName)) {
+				$items[] = $this->fetchItemsByTagFromBackend($tagName);
+			} else {
+				throw new PhpfastcacheInvalidArgumentException('$tagName must be a a string');
+			}
+		}
+
+		$items = \array_merge([], ...$items);
+
+		switch ($strategy) {
+			case TaggableCacheItemPoolInterface::TAG_STRATEGY_ALL:
+				foreach ($items as $key => $item) {
+					if (\array_diff($tagNames, $item->getTags())) {
+						unset($items[$key]);
+					}
+				}
+				break;
+
+			case TaggableCacheItemPoolInterface::TAG_STRATEGY_ONLY:
+				foreach ($items as $key => $item) {
+					if (\array_diff($tagNames, $item->getTags()) || \array_diff($item->getTags(), $tagNames)) {
+						unset($items[$key]);
+					}
+				}
+				break;
+		}
+		return $items;
+	}
+
+	/**
+	 * @param string $tagName
+	 * @return array
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	protected function fetchItemsByTagFromBackend(string $tagName): array
+	{
+		if (\is_string($tagName)) {
+			$driverResponse = $this->getItem($this->getTagKey($tagName));
+			if ($driverResponse->isHit()) {
+				$tagsItems = (array)$driverResponse->get();
+
+				/**
+				 * getItems() may provides expired item(s)
+				 * themselves provided by a cache of item
+				 * keys based stored the tag item.
+				 * Therefore we pass a filter callback
+				 * to remove the expired Item(s) provided by
+				 * the item keys passed through getItems()
+				 *
+				 * #headache
+				 */
+				return \array_filter(
+					$this->getItems(\array_unique(\array_keys($tagsItems))),
+					static function (ExtendedCacheItemInterface $item) {
+						return $item->isHit();
+					}
+				);
+			}
+			return [];
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('$tagName must be a string');
+	}
+
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	protected function getTagKey(string $key): string
+	{
+		return self::DRIVER_TAGS_KEY_PREFIX . $key;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function deleteItemsByTags(array $tagNames, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
+	{
+		$return = null;
+
+		foreach ($this->getItemsByTags($tagNames, $strategy) as $item) {
+			$result = $this->deleteItem($item->getKey());
+			if ($return !== false) {
+				$return = $result;
+			}
+		}
+
+		return (bool)$return;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function deleteItemsByTag(string $tagName, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
+	{
+		if (\is_string($tagName)) {
+			$return = null;
+			foreach ($this->getItemsByTag($tagName, $strategy) as $item) {
+				$result = $this->deleteItem($item->getKey());
+				if ($return !== false) {
+					$return = $result;
+				}
+			}
+
+			return (bool)$return;
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('$tagName must be a string');
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getItemsByTag(string $tagName, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): array
+	{
+		$items = $this->fetchItemsByTagFromBackend($tagName);
+		if ($strategy === TaggableCacheItemPoolInterface::TAG_STRATEGY_ONLY) {
+			foreach ($items as $key => $item) {
+				if (\array_diff($item->getTags(), $tagName)) {
+					unset($items[$key]);
+				}
+			}
+		}
+		return $items;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function incrementItemsByTags(array $tagNames, int $step = 1, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
+	{
+		$return = null;
+		foreach ($tagNames as $tagName) {
+			$result = $this->incrementItemsByTag($tagName, $step, $strategy);
+			if ($return !== false) {
+				$return = $result;
+			}
+		}
+
+		return (bool)$return;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function incrementItemsByTag(string $tagName, int $step = 1, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
+	{
+		if (\is_string($tagName) && \is_int($step)) {
+			foreach ($this->getItemsByTag($tagName, $strategy) as $item) {
+				$item->increment($step);
+				$this->saveDeferred($item);
+			}
+
+			return (bool)$this->commit();
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('$tagName must be a string and $step an integer');
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function decrementItemsByTags(array $tagNames, int $step = 1, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
+	{
+		$return = null;
+		foreach ($tagNames as $tagName) {
+			$result = $this->decrementItemsByTag($tagName, $step, $strategy);
+			if ($return !== false) {
+				$return = $result;
+			}
+		}
+
+		return (bool)$return;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function decrementItemsByTag(string $tagName, int $step = 1, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
+	{
+		if (\is_string($tagName) && \is_int($step)) {
+			foreach ($this->getItemsByTag($tagName, $strategy) as $item) {
+				$item->decrement($step);
+				$this->saveDeferred($item);
+			}
+
+			return (bool)$this->commit();
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('$tagName must be a string and $step an integer');
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function appendItemsByTags(array $tagNames, $data, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
+	{
+		$return = null;
+		foreach ($tagNames as $tagName) {
+			$result = $this->appendItemsByTag($tagName, $data, $strategy);
+			if ($return !== false) {
+				$return = $result;
+			}
+		}
+
+		return (bool)$return;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function appendItemsByTag(string $tagName, $data, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
+	{
+		if (\is_string($tagName)) {
+			foreach ($this->getItemsByTag($tagName, $strategy) as $item) {
+				$item->append($data);
+				$this->saveDeferred($item);
+			}
+
+			return (bool)$this->commit();
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('$tagName must be a string');
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function prependItemsByTags(array $tagNames, $data, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
+	{
+		$return = null;
+		foreach ($tagNames as $tagName) {
+			$result = $this->prependItemsByTag($tagName, $data, $strategy);
+			if ($return !== false) {
+				$return = $result;
+			}
+		}
+
+		return (bool)$return;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function prependItemsByTag(string $tagName, $data, int $strategy = TaggableCacheItemPoolInterface::TAG_STRATEGY_ONE): bool
+	{
+		if (\is_string($tagName)) {
+			foreach ($this->getItemsByTag($tagName, $strategy) as $item) {
+				$item->prepend($data);
+				$this->saveDeferred($item);
+			}
+
+			return (bool)$this->commit();
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('$tagName must be a string');
+	}
+
+	/**
+	 * @param array $wrapper
+	 * @return mixed
+	 */
+	protected function driverUnwrapTags(array $wrapper)
+	{
+		return $wrapper[self::DRIVER_TAGS_WRAPPER_INDEX];
+	}
+
+	/**
+	 * @param ExtendedCacheItemInterface $item
+	 * @throws PhpfastcacheInvalidArgumentException
+	 * @throws PhpfastcacheLogicException
+	 */
+	protected function cleanItemTags(ExtendedCacheItemInterface $item)
+	{
+		$this->driverWriteTags($item->removeTags($item->getTags()));
+	}
+
+	/**
+	 * @param ExtendedCacheItemInterface $item
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 * @throws PhpfastcacheLogicException
+	 */
+	protected function driverWriteTags(ExtendedCacheItemInterface $item): bool
+	{
+		/**
+		 * Do not attempt to write tags
+		 * on tags item, it can leads
+		 * to an infinite recursive calls
+		 */
+		if (\strpos($item->getKey(), self::DRIVER_TAGS_KEY_PREFIX) === 0) {
+			throw new PhpfastcacheLogicException('Trying to set tag(s) to an Tag item index: ' . $item->getKey());
+		}
+
+		if (!$item->getTags() && !$item->getRemovedTags()) {
+			return true;
+		}
+
+		/**
+		 * @var $tagsItems ExtendedCacheItemInterface[]
+		 */
+		$tagsItems = $this->getItems($this->getTagKeys($item->getTags()));
+
+		foreach ($tagsItems as $tagsItem) {
+			$data = $tagsItem->get();
+			$expTimestamp = $item->getExpirationDate()->getTimestamp();
+
+			/**
+			 * Using the key will
+			 * avoid to use array_unique
+			 * that has slow performances
+			 */
+
+			$tagsItem->set(\array_merge((array)$data, [$item->getKey() => $expTimestamp]))
+				->expiresAt($item->getExpirationDate());
+
+			$this->driverWrite($tagsItem);
+			$tagsItem->setHit(true);
+		}
+
+		/**
+		 * Also update removed tags to
+		 * keep the index up to date
+		 */
+		$tagsItems = $this->getItems($this->getTagKeys($item->getRemovedTags()));
+
+		foreach ($tagsItems as $tagsItem) {
+			$data = (array)$tagsItem->get();
+
+			unset($data[$item->getKey()]);
+			$tagsItem->set($data);
+
+			/**
+			 * Recalculate the expiration date
+			 *
+			 * If the $tagsItem does not have
+			 * any cache item references left
+			 * then remove it from tagsItems index
+			 */
+			if (\count($data)) {
+				$tagsItem->expiresAt((new DateTime())->setTimestamp(max($data)));
+				$this->driverWrite($tagsItem);
+				$tagsItem->setHit(true);
+			} else {
+				$this->deleteItem($tagsItem->getKey());
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param array $keys
+	 * @return array
+	 */
+	protected function getTagKeys(array $keys): array
+	{
+		return \array_map(
+			function (string $key) {
+				return $this->getTagKey($key);
+			},
+			$keys
+		);
+	}
 }

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Core/Pool/TaggableCacheItemPoolInterface.php

Indentation +235 added lines, -235 removed lines

@@ -26,256 +26,256 @@
  */
 interface TaggableCacheItemPoolInterface
 {
-    public const DRIVER_TAGS_KEY_PREFIX = '_TAG_';
+	public const DRIVER_TAGS_KEY_PREFIX = '_TAG_';
 
-    public const DRIVER_TAGS_WRAPPER_INDEX = 'g';
+	public const DRIVER_TAGS_WRAPPER_INDEX = 'g';
 
-    public const TAG_STRATEGY_ONE = 1;
+	public const TAG_STRATEGY_ONE = 1;
 
-    public const TAG_STRATEGY_ALL = 2;
+	public const TAG_STRATEGY_ALL = 2;
 
-    public const TAG_STRATEGY_ONLY = 4;
+	public const TAG_STRATEGY_ONLY = 4;
 
-    /**
-     * Returns a traversable set of cache items by a tag name.
-     *
-     * @param string $tagName
-     * An indexed array of keys of items to retrieve.
-     *
-     * @param int $strategy
-     *
-     * @return ExtendedCacheItemInterface[]
-     *   A traversable collection of Cache Items keyed by the cache keys of
-     *   each item. A Cache item will be returned for each key, even if that
-     *   key is not found. However, if no keys are specified then an empty
-     *   traversable MUST be returned instead.
-     * @throws InvalidArgumentException
-     *   If any of the keys in $keys are not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function getItemsByTag(string $tagName, int $strategy = self::TAG_STRATEGY_ONE): array;
+	/**
+	 * Returns a traversable set of cache items by a tag name.
+	 *
+	 * @param string $tagName
+	 * An indexed array of keys of items to retrieve.
+	 *
+	 * @param int $strategy
+	 *
+	 * @return ExtendedCacheItemInterface[]
+	 *   A traversable collection of Cache Items keyed by the cache keys of
+	 *   each item. A Cache item will be returned for each key, even if that
+	 *   key is not found. However, if no keys are specified then an empty
+	 *   traversable MUST be returned instead.
+	 * @throws InvalidArgumentException
+	 *   If any of the keys in $keys are not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function getItemsByTag(string $tagName, int $strategy = self::TAG_STRATEGY_ONE): array;
 
-    /**
-     * Returns a traversable set of cache items by one of multiple tag names.
-     *
-     * @param string[] $tagNames
-     * An indexed array of keys of items to retrieve.
-     *
-     * @param int $strategy
-     *
-     * @return ExtendedCacheItemInterface[]
-     *   A traversable collection of Cache Items keyed by the cache keys of
-     *   each item. A Cache item will be returned for each key, even if that
-     *   key is not found. However, if no keys are specified then an empty
-     *   traversable MUST be returned instead.
-     * @throws InvalidArgumentException
-     *   If any of the keys in $keys are not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function getItemsByTags(array $tagNames, int $strategy = self::TAG_STRATEGY_ONE): array;
+	/**
+	 * Returns a traversable set of cache items by one of multiple tag names.
+	 *
+	 * @param string[] $tagNames
+	 * An indexed array of keys of items to retrieve.
+	 *
+	 * @param int $strategy
+	 *
+	 * @return ExtendedCacheItemInterface[]
+	 *   A traversable collection of Cache Items keyed by the cache keys of
+	 *   each item. A Cache item will be returned for each key, even if that
+	 *   key is not found. However, if no keys are specified then an empty
+	 *   traversable MUST be returned instead.
+	 * @throws InvalidArgumentException
+	 *   If any of the keys in $keys are not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function getItemsByTags(array $tagNames, int $strategy = self::TAG_STRATEGY_ONE): array;
 
-    /**
-     * Returns A json string that represents an array of items by tags-based.
-     *
-     * @param string[] $tagNames
-     * An indexed array of keys of items to retrieve.
-     * @param int $option \json_encode() options
-     * @param int $depth \json_encode() depth
-     * @param int $strategy
-     *
-     * @return string
-     * @throws InvalidArgumentException
-     *   If any of the keys in $keys are not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function getItemsByTagsAsJsonString(array $tagNames, int $option = 0, int $depth = 512, int $strategy = self::TAG_STRATEGY_ONE): string;
+	/**
+	 * Returns A json string that represents an array of items by tags-based.
+	 *
+	 * @param string[] $tagNames
+	 * An indexed array of keys of items to retrieve.
+	 * @param int $option \json_encode() options
+	 * @param int $depth \json_encode() depth
+	 * @param int $strategy
+	 *
+	 * @return string
+	 * @throws InvalidArgumentException
+	 *   If any of the keys in $keys are not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function getItemsByTagsAsJsonString(array $tagNames, int $option = 0, int $depth = 512, int $strategy = self::TAG_STRATEGY_ONE): string;
 
-    /**
-     * Removes the item from the pool by tag.
-     *
-     * @param string $tagName
-     *   The tag for which to delete
-     *
-     * @param int $strategy
-     *
-     * @return bool
-     *   True if the item was successfully removed. False if there was an error.
-     * @throws InvalidArgumentException
-     *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function deleteItemsByTag(string $tagName, int $strategy = self::TAG_STRATEGY_ONE): bool;
+	/**
+	 * Removes the item from the pool by tag.
+	 *
+	 * @param string $tagName
+	 *   The tag for which to delete
+	 *
+	 * @param int $strategy
+	 *
+	 * @return bool
+	 *   True if the item was successfully removed. False if there was an error.
+	 * @throws InvalidArgumentException
+	 *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function deleteItemsByTag(string $tagName, int $strategy = self::TAG_STRATEGY_ONE): bool;
 
-    /**
-     * Removes the item from the pool by one of multiple tag names.
-     *
-     * @param string[] $tagNames
-     *   The tag for which to delete
-     *
-     * @param int $strategy
-     *
-     * @return bool
-     *   True if the items were successfully removed. False if there was an error.
-     * @throws InvalidArgumentException
-     *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function deleteItemsByTags(array $tagNames, int $strategy = self::TAG_STRATEGY_ONE): bool;
+	/**
+	 * Removes the item from the pool by one of multiple tag names.
+	 *
+	 * @param string[] $tagNames
+	 *   The tag for which to delete
+	 *
+	 * @param int $strategy
+	 *
+	 * @return bool
+	 *   True if the items were successfully removed. False if there was an error.
+	 * @throws InvalidArgumentException
+	 *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function deleteItemsByTags(array $tagNames, int $strategy = self::TAG_STRATEGY_ONE): bool;
 
-    /**
-     * Increment the items from the pool by tag.
-     *
-     * @param string $tagName
-     *   The tag for which to increment
-     *
-     * @param int $step
-     *
-     * @param int $strategy
-     *
-     * @return bool
-     *   True if the item was successfully incremented. False if there was an error.
-     * @throws InvalidArgumentException
-     *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function incrementItemsByTag(string $tagName, int $step = 1, int $strategy = self::TAG_STRATEGY_ONE): bool;
+	/**
+	 * Increment the items from the pool by tag.
+	 *
+	 * @param string $tagName
+	 *   The tag for which to increment
+	 *
+	 * @param int $step
+	 *
+	 * @param int $strategy
+	 *
+	 * @return bool
+	 *   True if the item was successfully incremented. False if there was an error.
+	 * @throws InvalidArgumentException
+	 *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function incrementItemsByTag(string $tagName, int $step = 1, int $strategy = self::TAG_STRATEGY_ONE): bool;
 
-    /**
-     * Increment the items from the pool by one of multiple tag names.
-     *
-     * @param string[] $tagNames
-     *   The tag for which to increment
-     *
-     * @param int $step
-     *
-     * @param int $strategy
-     *
-     * @return bool
-     *   True if the items were successfully incremented. False if there was an error.
-     * @throws InvalidArgumentException
-     *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function incrementItemsByTags(array $tagNames, int $step = 1, int $strategy = self::TAG_STRATEGY_ONE): bool;
+	/**
+	 * Increment the items from the pool by one of multiple tag names.
+	 *
+	 * @param string[] $tagNames
+	 *   The tag for which to increment
+	 *
+	 * @param int $step
+	 *
+	 * @param int $strategy
+	 *
+	 * @return bool
+	 *   True if the items were successfully incremented. False if there was an error.
+	 * @throws InvalidArgumentException
+	 *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function incrementItemsByTags(array $tagNames, int $step = 1, int $strategy = self::TAG_STRATEGY_ONE): bool;
 
-    /**
-     * Decrement the items from the pool by tag.
-     *
-     * @param string $tagName
-     *   The tag for which to decrement
-     *
-     * @param int $step
-     *
-     * @param int $strategy
-     *
-     * @return bool
-     *   True if the item was successfully decremented. False if there was an error.
-     * @throws InvalidArgumentException
-     *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function decrementItemsByTag(string $tagName, int $step = 1, int $strategy = self::TAG_STRATEGY_ONE): bool;
+	/**
+	 * Decrement the items from the pool by tag.
+	 *
+	 * @param string $tagName
+	 *   The tag for which to decrement
+	 *
+	 * @param int $step
+	 *
+	 * @param int $strategy
+	 *
+	 * @return bool
+	 *   True if the item was successfully decremented. False if there was an error.
+	 * @throws InvalidArgumentException
+	 *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function decrementItemsByTag(string $tagName, int $step = 1, int $strategy = self::TAG_STRATEGY_ONE): bool;
 
-    /**
-     * Decrement the items from the pool by one of multiple tag names.
-     *
-     * @param string[] $tagNames
-     *   The tag for which to decrement
-     *
-     * @param int $step
-     *
-     * @param int $strategy
-     *
-     * @return bool
-     *   True if the item was successfully decremented. False if there was an error.
-     * @throws InvalidArgumentException
-     *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function decrementItemsByTags(array $tagNames, int $step = 1, int $strategy = self::TAG_STRATEGY_ONE): bool;
+	/**
+	 * Decrement the items from the pool by one of multiple tag names.
+	 *
+	 * @param string[] $tagNames
+	 *   The tag for which to decrement
+	 *
+	 * @param int $step
+	 *
+	 * @param int $strategy
+	 *
+	 * @return bool
+	 *   True if the item was successfully decremented. False if there was an error.
+	 * @throws InvalidArgumentException
+	 *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function decrementItemsByTags(array $tagNames, int $step = 1, int $strategy = self::TAG_STRATEGY_ONE): bool;
 
-    /**
-     * Decrement the items from the pool by tag.
-     *
-     * @param string $tagName
-     *   The tag for which to append
-     *
-     * @param array|string $data
-     *
-     * @param int $strategy
-     *
-     * @return bool
-     *   True if the item was successfully appended. False if there was an error.
-     * @throws InvalidArgumentException
-     *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function appendItemsByTag(string $tagName, $data, int $strategy = self::TAG_STRATEGY_ONE): bool;
+	/**
+	 * Decrement the items from the pool by tag.
+	 *
+	 * @param string $tagName
+	 *   The tag for which to append
+	 *
+	 * @param array|string $data
+	 *
+	 * @param int $strategy
+	 *
+	 * @return bool
+	 *   True if the item was successfully appended. False if there was an error.
+	 * @throws InvalidArgumentException
+	 *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function appendItemsByTag(string $tagName, $data, int $strategy = self::TAG_STRATEGY_ONE): bool;
 
-    /**
-     * Append the items from the pool by one of multiple tag names.
-     *
-     * @param string[] $tagNames
-     *   The tag for which to append
-     *
-     * @param array|string $data
-     *
-     * @param int $strategy
-     *
-     * @return bool
-     *   True if the items were successfully appended. False if there was an error.
-     * @throws InvalidArgumentException
-     *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function appendItemsByTags(array $tagNames, $data, int $strategy = self::TAG_STRATEGY_ONE): bool;
+	/**
+	 * Append the items from the pool by one of multiple tag names.
+	 *
+	 * @param string[] $tagNames
+	 *   The tag for which to append
+	 *
+	 * @param array|string $data
+	 *
+	 * @param int $strategy
+	 *
+	 * @return bool
+	 *   True if the items were successfully appended. False if there was an error.
+	 * @throws InvalidArgumentException
+	 *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function appendItemsByTags(array $tagNames, $data, int $strategy = self::TAG_STRATEGY_ONE): bool;
 
-    /**
-     * Prepend the items from the pool by tag.
-     *
-     * @param string $tagName
-     *   The tag for which to prepend
-     *
-     * @param array|string $data
-     *
-     * @param int $strategy
-     *
-     * @return bool
-     *   True if the item was successfully prepended. False if there was an error.
-     * @throws InvalidArgumentException
-     *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function prependItemsByTag(string $tagName, $data, int $strategy = self::TAG_STRATEGY_ONE): bool;
+	/**
+	 * Prepend the items from the pool by tag.
+	 *
+	 * @param string $tagName
+	 *   The tag for which to prepend
+	 *
+	 * @param array|string $data
+	 *
+	 * @param int $strategy
+	 *
+	 * @return bool
+	 *   True if the item was successfully prepended. False if there was an error.
+	 * @throws InvalidArgumentException
+	 *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function prependItemsByTag(string $tagName, $data, int $strategy = self::TAG_STRATEGY_ONE): bool;
 
-    /**
-     * Prepend the items from the pool by one of multiple tag names.
-     *
-     * @param string[] $tagNames
-     *   The tag for which to prepend
-     *
-     * @param array|string $data
-     *
-     * @param int $strategy
-     *
-     * @return bool
-     *   True if the item was successfully prepended. False if there was an error.
-     * @throws InvalidArgumentException
-     *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function prependItemsByTags(array $tagNames, $data, int $strategy = self::TAG_STRATEGY_ONE): bool;
+	/**
+	 * Prepend the items from the pool by one of multiple tag names.
+	 *
+	 * @param string[] $tagNames
+	 *   The tag for which to prepend
+	 *
+	 * @param array|string $data
+	 *
+	 * @param int $strategy
+	 *
+	 * @return bool
+	 *   True if the item was successfully prepended. False if there was an error.
+	 * @throws InvalidArgumentException
+	 *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function prependItemsByTags(array $tagNames, $data, int $strategy = self::TAG_STRATEGY_ONE): bool;
 }

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Core/Pool/IO/IOHelperTrait.php

Indentation +310 added lines, -310 removed lines

@@ -37,228 +37,228 @@ 
  */
 trait IOHelperTrait
 {
-    /**
-     * @var array
-     */
-    public $tmp = [];
-
-    /**
-     * Provide a generic getStats() method
-     * for files-based drivers
-     * @return DriverStatistic
-     * @throws PhpfastcacheIOException
-     */
-    public function getStats(): DriverStatistic
-    {
-        $stat = new DriverStatistic();
-        $path = $this->getFilePath(false);
-
-        if (!is_dir($path)) {
-            throw new PhpfastcacheIOException("Can't read PATH:" . $path);
-        }
-        $stat->setRawData(
-                [
-                    'tmp' => $this->tmp,
-                ]
-            )
-            ->setSize(Directory::dirSize($path))
-            ->setInfo('Number of files used to build the cache: ' . Directory::getFileCount($path));
-
-        if($this->getConfig()->isUseStaticItemCaching()){
-            $stat->setData(implode(', ', \array_keys($this->itemInstances)));
-        }else{
-            $stat->setData('No data available since static item caching option (useStaticItemCaching) is disabled.');
-        }
-
-        return $stat;
-    }
-
-    /**
-     * @param $keyword
-     * @param bool $skip
-     * @return string
-     * @throws PhpfastcacheIOException
-     */
-    protected function getFilePath($keyword, $skip = false): string
-    {
-        $path = $this->getPath();
-
-        if ($keyword === false) {
-            return $path;
-        }
-
-        $filename = $this->encodeFilename($keyword);
-        $folder = \substr($filename, 0, 2) . DIRECTORY_SEPARATOR . \substr($filename, 2, 2);
-        $path = \rtrim($path, '/\\') . DIRECTORY_SEPARATOR . $folder;
-
-        /**
-         * Skip Create Sub Folders;
-         */
-        if (!$skip && !\is_dir($path) && @!\mkdir($path, $this->getDefaultChmod(), true) && !\is_dir($path)) {
-            throw new PhpfastcacheIOException(
-                'Path "' . $path . '" is not writable, please set a chmod 0777 or any writable permission and make sure to make use of an absolute path !'
-            );
-        }
-
-        return $path . \DIRECTORY_SEPARATOR . $filename . '.' . $this->getConfig()->getCacheFileExtension();
-    }
-
-    /**
-     * @param bool $readonly
-     * @return string
-     * @throws PhpfastcacheIOException
-     */
-    public function getPath($readonly = false): string
-    {
-        /**
-         * Get the base system temporary directory
-         */
-        $tmp_dir = \rtrim(\ini_get('upload_tmp_dir') ?: \sys_get_temp_dir(), '\\/') . DIRECTORY_SEPARATOR . 'phpfastcache';
-
-        /**
-         * Calculate the security key
-         */
-        {
-            $securityKey = $this->getConfig()->getSecurityKey();
-            if (!$securityKey || \mb_strtolower($securityKey) === 'auto') {
-                if (isset($_SERVER['HTTP_HOST'])) {
-                    $securityKey = \preg_replace('/^www./', '', \strtolower(\str_replace(':', '_', $_SERVER['HTTP_HOST'])));
-                } else {
-                    $securityKey = ($this->isPHPModule() ? 'web' : 'cli');
-                }
-            }
-
-            if ($securityKey !== '') {
-                $securityKey .= '/';
-            }
-
-            $securityKey = static::cleanFileName($securityKey);
-        }
-
-        /**
-         * Extends the temporary directory
-         * with the security key and the driver name
-         */
-        $tmp_dir = \rtrim($tmp_dir, '/') . DIRECTORY_SEPARATOR;
-
-        if (empty($this->getConfig()->getPath())) {
-            $path = $tmp_dir;
-        } else {
-            $path = \rtrim($this->getConfig()->getPath(), '/') . DIRECTORY_SEPARATOR;
-        }
-
-        $path_suffix = $securityKey . DIRECTORY_SEPARATOR . $this->getDriverName();
-        $full_path = Directory::getAbsolutePath($path . $path_suffix);
-        $full_path_tmp = Directory::getAbsolutePath($tmp_dir . $path_suffix);
-        $full_path_hash = $this->getConfig()->getDefaultFileNameHashFunction()($full_path);
-
-        /**
-         * In readonly mode we only attempt
-         * to verify if the directory exists
-         * or not, if it does not then we
-         * return the temp dir
-         */
-        if ($readonly === true) {
-            if ($this->getConfig()->isAutoTmpFallback() && (!@\file_exists($full_path) || !@\is_writable($full_path))) {
-                return $full_path_tmp;
-            }
-            return $full_path;
-        }
-
-        if (!isset($this->tmp[$full_path_hash]) || (!@\file_exists($full_path) || !@\is_writable($full_path))) {
-            if (!@\file_exists($full_path)) {
-                if (@mkdir($full_path, $this->getDefaultChmod(), true) === false && !\is_dir($full_path)) {
-                    throw new PhpfastcacheIOException('The directory ' . $full_path . ' could not be created.');
-                }
-            } else {
-                if (!@\is_writable($full_path)) {
-                    if (!@\chmod($full_path, $this->getDefaultChmod()) && $this->getConfig()->isAutoTmpFallback()) {
-                        /**
-                         * Switch back to tmp dir
-                         * again if the path is not writable
-                         */
-                        $full_path = $full_path_tmp;
-                        if (!@\file_exists($full_path)) {
-                            if (@\mkdir($full_path, $this->getDefaultChmod(), true) && !\is_dir($full_path)) {
-                                throw new PhpfastcacheIOException('The directory ' . $full_path . ' could not be created.');
-                            }
-                        }
-                    }
-                }
-            }
-
-            /**
-             * In case there is no directory
-             * writable including the temporary
-             * one, we must throw an exception
-             */
-            if (!@\file_exists($full_path) || !@\is_writable($full_path)) {
-                throw new PhpfastcacheIOException(
-                    'Path "' . $full_path . '" is not writable, please set a chmod 0777 or any writable permission and make sure to make use of an absolute path !'
-                );
-            }
-
-            $this->tmp[$full_path_hash] = $full_path;
-            $this->htaccessGen($full_path, $this->getConfig()->isValidOption('htaccess') ? $this->getConfig()->getHtaccess() : false);
-        }
-
-        return realpath($full_path);
-    }
-
-    /**
-     * @param $filename
-     * @return string
-     */
-    protected static function cleanFileName($filename): string
-    {
-        $regex = [
-            '/[\?\[\]\/\\\=\<\>\:\;\,\'\"\&\$\#\*\(\)\|\~\`\!\{\}]/',
-            '/\.$/',
-            '/^\./',
-        ];
-        $replace = ['-', '', ''];
-
-        return \trim(\preg_replace($regex, $replace, \trim($filename)), '-');
-    }
-
-    /**
-     * @return int
-     */
-    protected function getDefaultChmod(): int
-    {
-        if (!$this->getConfig()->getDefaultChmod()) {
-            return 0777;
-        }
-
-        return $this->getConfig()->getDefaultChmod();
-    }
-
-    /**
-     * @param $path
-     * @param bool $create
-     * @throws PhpfastcacheIOException
-     */
-    protected function htaccessGen($path, $create = true)
-    {
-        if ($create === true) {
-            if (!\is_writable($path)) {
-                try {
-                    if (!\chmod($path, 0777)) {
-                        throw new PhpfastcacheIOException('Chmod failed on : ' . $path);
-                    }
-                } catch (PhpfastcacheIOException $e) {
-                    throw new PhpfastcacheIOException('PLEASE CHMOD ' . $path . ' - 0777 OR ANY WRITABLE PERMISSION!', 0, $e);
-                }
-            }
-
-            if (!\file_exists($path . '/.htaccess')) {
-                $file = @\fopen($path . '/.htaccess', 'w+b');
-                if (!$file) {
-                    throw new PhpfastcacheIOException('PLEASE CHMOD ' . $path . ' - 0777 OR ANY WRITABLE PERMISSION!');
-                }
-                \fwrite(
-                    $file,
-                    <<<HTACCESS
+	/**
+	 * @var array
+	 */
+	public $tmp = [];
+
+	/**
+	 * Provide a generic getStats() method
+	 * for files-based drivers
+	 * @return DriverStatistic
+	 * @throws PhpfastcacheIOException
+	 */
+	public function getStats(): DriverStatistic
+	{
+		$stat = new DriverStatistic();
+		$path = $this->getFilePath(false);
+
+		if (!is_dir($path)) {
+			throw new PhpfastcacheIOException("Can't read PATH:" . $path);
+		}
+		$stat->setRawData(
+				[
+					'tmp' => $this->tmp,
+				]
+			)
+			->setSize(Directory::dirSize($path))
+			->setInfo('Number of files used to build the cache: ' . Directory::getFileCount($path));
+
+		if($this->getConfig()->isUseStaticItemCaching()){
+			$stat->setData(implode(', ', \array_keys($this->itemInstances)));
+		}else{
+			$stat->setData('No data available since static item caching option (useStaticItemCaching) is disabled.');
+		}
+
+		return $stat;
+	}
+
+	/**
+	 * @param $keyword
+	 * @param bool $skip
+	 * @return string
+	 * @throws PhpfastcacheIOException
+	 */
+	protected function getFilePath($keyword, $skip = false): string
+	{
+		$path = $this->getPath();
+
+		if ($keyword === false) {
+			return $path;
+		}
+
+		$filename = $this->encodeFilename($keyword);
+		$folder = \substr($filename, 0, 2) . DIRECTORY_SEPARATOR . \substr($filename, 2, 2);
+		$path = \rtrim($path, '/\\') . DIRECTORY_SEPARATOR . $folder;
+
+		/**
+		 * Skip Create Sub Folders;
+		 */
+		if (!$skip && !\is_dir($path) && @!\mkdir($path, $this->getDefaultChmod(), true) && !\is_dir($path)) {
+			throw new PhpfastcacheIOException(
+				'Path "' . $path . '" is not writable, please set a chmod 0777 or any writable permission and make sure to make use of an absolute path !'
+			);
+		}
+
+		return $path . \DIRECTORY_SEPARATOR . $filename . '.' . $this->getConfig()->getCacheFileExtension();
+	}
+
+	/**
+	 * @param bool $readonly
+	 * @return string
+	 * @throws PhpfastcacheIOException
+	 */
+	public function getPath($readonly = false): string
+	{
+		/**
+		 * Get the base system temporary directory
+		 */
+		$tmp_dir = \rtrim(\ini_get('upload_tmp_dir') ?: \sys_get_temp_dir(), '\\/') . DIRECTORY_SEPARATOR . 'phpfastcache';
+
+		/**
+		 * Calculate the security key
+		 */
+		{
+			$securityKey = $this->getConfig()->getSecurityKey();
+			if (!$securityKey || \mb_strtolower($securityKey) === 'auto') {
+				if (isset($_SERVER['HTTP_HOST'])) {
+					$securityKey = \preg_replace('/^www./', '', \strtolower(\str_replace(':', '_', $_SERVER['HTTP_HOST'])));
+				} else {
+					$securityKey = ($this->isPHPModule() ? 'web' : 'cli');
+				}
+			}
+
+			if ($securityKey !== '') {
+				$securityKey .= '/';
+			}
+
+			$securityKey = static::cleanFileName($securityKey);
+		}
+
+		/**
+		 * Extends the temporary directory
+		 * with the security key and the driver name
+		 */
+		$tmp_dir = \rtrim($tmp_dir, '/') . DIRECTORY_SEPARATOR;
+
+		if (empty($this->getConfig()->getPath())) {
+			$path = $tmp_dir;
+		} else {
+			$path = \rtrim($this->getConfig()->getPath(), '/') . DIRECTORY_SEPARATOR;
+		}
+
+		$path_suffix = $securityKey . DIRECTORY_SEPARATOR . $this->getDriverName();
+		$full_path = Directory::getAbsolutePath($path . $path_suffix);
+		$full_path_tmp = Directory::getAbsolutePath($tmp_dir . $path_suffix);
+		$full_path_hash = $this->getConfig()->getDefaultFileNameHashFunction()($full_path);
+
+		/**
+		 * In readonly mode we only attempt
+		 * to verify if the directory exists
+		 * or not, if it does not then we
+		 * return the temp dir
+		 */
+		if ($readonly === true) {
+			if ($this->getConfig()->isAutoTmpFallback() && (!@\file_exists($full_path) || !@\is_writable($full_path))) {
+				return $full_path_tmp;
+			}
+			return $full_path;
+		}
+
+		if (!isset($this->tmp[$full_path_hash]) || (!@\file_exists($full_path) || !@\is_writable($full_path))) {
+			if (!@\file_exists($full_path)) {
+				if (@mkdir($full_path, $this->getDefaultChmod(), true) === false && !\is_dir($full_path)) {
+					throw new PhpfastcacheIOException('The directory ' . $full_path . ' could not be created.');
+				}
+			} else {
+				if (!@\is_writable($full_path)) {
+					if (!@\chmod($full_path, $this->getDefaultChmod()) && $this->getConfig()->isAutoTmpFallback()) {
+						/**
+						 * Switch back to tmp dir
+						 * again if the path is not writable
+						 */
+						$full_path = $full_path_tmp;
+						if (!@\file_exists($full_path)) {
+							if (@\mkdir($full_path, $this->getDefaultChmod(), true) && !\is_dir($full_path)) {
+								throw new PhpfastcacheIOException('The directory ' . $full_path . ' could not be created.');
+							}
+						}
+					}
+				}
+			}
+
+			/**
+			 * In case there is no directory
+			 * writable including the temporary
+			 * one, we must throw an exception
+			 */
+			if (!@\file_exists($full_path) || !@\is_writable($full_path)) {
+				throw new PhpfastcacheIOException(
+					'Path "' . $full_path . '" is not writable, please set a chmod 0777 or any writable permission and make sure to make use of an absolute path !'
+				);
+			}
+
+			$this->tmp[$full_path_hash] = $full_path;
+			$this->htaccessGen($full_path, $this->getConfig()->isValidOption('htaccess') ? $this->getConfig()->getHtaccess() : false);
+		}
+
+		return realpath($full_path);
+	}
+
+	/**
+	 * @param $filename
+	 * @return string
+	 */
+	protected static function cleanFileName($filename): string
+	{
+		$regex = [
+			'/[\?\[\]\/\\\=\<\>\:\;\,\'\"\&\$\#\*\(\)\|\~\`\!\{\}]/',
+			'/\.$/',
+			'/^\./',
+		];
+		$replace = ['-', '', ''];
+
+		return \trim(\preg_replace($regex, $replace, \trim($filename)), '-');
+	}
+
+	/**
+	 * @return int
+	 */
+	protected function getDefaultChmod(): int
+	{
+		if (!$this->getConfig()->getDefaultChmod()) {
+			return 0777;
+		}
+
+		return $this->getConfig()->getDefaultChmod();
+	}
+
+	/**
+	 * @param $path
+	 * @param bool $create
+	 * @throws PhpfastcacheIOException
+	 */
+	protected function htaccessGen($path, $create = true)
+	{
+		if ($create === true) {
+			if (!\is_writable($path)) {
+				try {
+					if (!\chmod($path, 0777)) {
+						throw new PhpfastcacheIOException('Chmod failed on : ' . $path);
+					}
+				} catch (PhpfastcacheIOException $e) {
+					throw new PhpfastcacheIOException('PLEASE CHMOD ' . $path . ' - 0777 OR ANY WRITABLE PERMISSION!', 0, $e);
+				}
+			}
+
+			if (!\file_exists($path . '/.htaccess')) {
+				$file = @\fopen($path . '/.htaccess', 'w+b');
+				if (!$file) {
+					throw new PhpfastcacheIOException('PLEASE CHMOD ' . $path . ' - 0777 OR ANY WRITABLE PERMISSION!');
+				}
+				\fwrite(
+					$file,
+					<<<HTACCESS
 ### This .htaccess is auto-generated by PhpFastCache ###
 <IfModule mod_authz_host>
 Require all denied
@@ -268,97 +268,97 @@ 
 Deny from all
 </IfModule>
 HTACCESS
-                );
-                \fclose($file);
-            }
-        }
-    }
-
-    /**
-     * @param $keyword
-     * @return string
-     */
-    protected function encodeFilename($keyword): string
-    {
-        return $this->getConfig()->getDefaultFileNameHashFunction()($keyword);
-    }
-
-    /**
-     * @param $file
-     * @return string
-     * @throws PhpfastcacheIOException
-     */
-    protected function readFile($file): string
-    {
-        if (!\is_readable($file)) {
-            throw new PhpfastcacheIOException("Cannot read file located at: {$file}");
-        }
-        if (\function_exists('file_get_contents')) {
-            return (string)\file_get_contents($file);
-        }
-
-        $string = '';
-
-        $file_handle = @\fopen($file, 'rb');
-        while (!\feof($file_handle)) {
-            $line = \fgets($file_handle);
-            $string .= $line;
-        }
-        \fclose($file_handle);
-
-        return $string;
-    }
-
-    /********************
+				);
+				\fclose($file);
+			}
+		}
+	}
+
+	/**
+	 * @param $keyword
+	 * @return string
+	 */
+	protected function encodeFilename($keyword): string
+	{
+		return $this->getConfig()->getDefaultFileNameHashFunction()($keyword);
+	}
+
+	/**
+	 * @param $file
+	 * @return string
+	 * @throws PhpfastcacheIOException
+	 */
+	protected function readFile($file): string
+	{
+		if (!\is_readable($file)) {
+			throw new PhpfastcacheIOException("Cannot read file located at: {$file}");
+		}
+		if (\function_exists('file_get_contents')) {
+			return (string)\file_get_contents($file);
+		}
+
+		$string = '';
+
+		$file_handle = @\fopen($file, 'rb');
+		while (!\feof($file_handle)) {
+			$line = \fgets($file_handle);
+			$string .= $line;
+		}
+		\fclose($file_handle);
+
+		return $string;
+	}
+
+	/********************
      *
      * PSR-6 Extended Methods
      *
      *******************/
 
-    /**
-     * @param string $file
-     * @param string $data
-     * @param bool $secureFileManipulation
-     * @return bool
-     * @throws PhpfastcacheIOException
-     */
-    protected function writefile(string $file, string $data, bool $secureFileManipulation = false): bool
-    {
-        /**
-         * @eventName CacheWriteFileOnDisk
-         * @param ExtendedCacheItemPoolInterface $this
-         * @param string $file
-         * @param bool $secureFileManipulation
-         *
-         */
-        $this->eventManager->dispatch('CacheWriteFileOnDisk', $this, $file, $secureFileManipulation);
-
-        if ($secureFileManipulation) {
-            $tmpFilename = Directory::getAbsolutePath(
-                dirname($file) . \DIRECTORY_SEPARATOR . 'tmp_' . $this->getConfig()->getDefaultFileNameHashFunction()(
-                    \bin2hex(\random_bytes(16))
-                )
-            ) . '.' .  $this->getConfig()->getCacheFileExtension() . \random_int(1000, 9999);
-
-            $handle = \fopen($tmpFilename, 'w+b');
-            if (\is_resource($handle)) {
-                \flock($handle, \LOCK_EX);
-                $octetWritten = fwrite($handle, $data);
-                \flock($handle, \LOCK_UN);
-                \fclose($handle);
-            }
-
-            if (!\rename($tmpFilename, $file)) {
-                throw new PhpfastcacheIOException(\sprintf('Failed to rename %s to %s', $tmpFilename, $file));
-            }
-        } else {
-            $handle = \fopen($file, 'w+b');
-            if (\is_resource($handle)) {
-                $octetWritten = \fwrite($handle, $data);
-                \fclose($handle);
-            }
-        }
-
-        return (bool)($octetWritten ?? false);
-    }
+	/**
+	 * @param string $file
+	 * @param string $data
+	 * @param bool $secureFileManipulation
+	 * @return bool
+	 * @throws PhpfastcacheIOException
+	 */
+	protected function writefile(string $file, string $data, bool $secureFileManipulation = false): bool
+	{
+		/**
+		 * @eventName CacheWriteFileOnDisk
+		 * @param ExtendedCacheItemPoolInterface $this
+		 * @param string $file
+		 * @param bool $secureFileManipulation
+		 *
+		 */
+		$this->eventManager->dispatch('CacheWriteFileOnDisk', $this, $file, $secureFileManipulation);
+
+		if ($secureFileManipulation) {
+			$tmpFilename = Directory::getAbsolutePath(
+				dirname($file) . \DIRECTORY_SEPARATOR . 'tmp_' . $this->getConfig()->getDefaultFileNameHashFunction()(
+					\bin2hex(\random_bytes(16))
+				)
+			) . '.' .  $this->getConfig()->getCacheFileExtension() . \random_int(1000, 9999);
+
+			$handle = \fopen($tmpFilename, 'w+b');
+			if (\is_resource($handle)) {
+				\flock($handle, \LOCK_EX);
+				$octetWritten = fwrite($handle, $data);
+				\flock($handle, \LOCK_UN);
+				\fclose($handle);
+			}
+
+			if (!\rename($tmpFilename, $file)) {
+				throw new PhpfastcacheIOException(\sprintf('Failed to rename %s to %s', $tmpFilename, $file));
+			}
+		} else {
+			$handle = \fopen($file, 'w+b');
+			if (\is_resource($handle)) {
+				$octetWritten = \fwrite($handle, $data);
+				\fclose($handle);
+			}
+		}
+
+		return (bool)($octetWritten ?? false);
+	}
 }

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Core/Pool/ExtendedCacheItemPoolInterface.php

Indentation +165 added lines, -165 removed lines

@@ -41,171 +41,171 @@
  */
 interface ExtendedCacheItemPoolInterface extends CacheItemPoolInterface, EventManagerDispatcherInterface, ClassNamespaceResolverInterface, TaggableCacheItemPoolInterface
 {
-    public const DRIVER_CHECK_FAILURE = '%s is not installed or is misconfigured, cannot continue. 
+	public const DRIVER_CHECK_FAILURE = '%s is not installed or is misconfigured, cannot continue. 
     Also, please verify the suggested dependencies in composer because as of the V6, 3rd party libraries are no longer required.';
 
-    public const DRIVER_CONNECT_FAILURE = '%s failed to connect with the following error message: "%s" line %d in %s';
-
-    public const DRIVER_KEY_WRAPPER_INDEX = 'k';
-
-    public const DRIVER_DATA_WRAPPER_INDEX = 'd';
-
-    /**
-     * Expiration date Index
-     */
-    public const DRIVER_EDATE_WRAPPER_INDEX = 'e';
-
-    /**
-     * Creation date Index
-     */
-    public const DRIVER_CDATE_WRAPPER_INDEX = 'c';
-
-    /**
-     * Modification date Index
-     */
-    public const DRIVER_MDATE_WRAPPER_INDEX = 'm';
-
-    /**
-     * Return the config class name
-     * @return string
-     */
-    public static function getConfigClass(): string;
-
-    /**
-     * @return ConfigurationOption
-     */
-    public function getConfig(): ConfigurationOption;
-
-    /**
-     * @return ConfigurationOption
-     */
-    public function getDefaultConfig(): ConfigurationOption;
-
-    /**
-     * @return string
-     */
-    public function getDriverName(): string;
-
-    /**
-     * @return mixed
-     */
-    public function getInstanceId(): string;
-
-    /**
-     * [phpFastCache phpDoc Override]
-     * Returns a Cache Item representing the specified key.
-     *
-     * This method must always return a CacheItemInterface object, even in case of
-     * a cache miss. It MUST NOT return null.
-     *
-     * @param string $key
-     *   The key for which to return the corresponding Cache Item.
-     *
-     * @return ExtendedCacheItemInterface
-     *   The corresponding Cache Item.
-     * @throws PhpfastcacheInvalidArgumentException
-     *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function getItem($key);
-
-    /**
-     * [phpFastCache phpDoc Override]
-     * Returns a traversable set of cache items.
-     *
-     * @param array $keys
-     * An indexed array of keys of items to retrieve.
-     *
-     * @return ExtendedCacheItemInterface[]
-     *   A traversable collection of Cache Items keyed by the cache keys of
-     *   each item. A Cache item will be returned for each key, even if that
-     *   key is not found. However, if no keys are specified then an empty
-     *   traversable MUST be returned instead.
-     * @throws InvalidArgumentException
-     *   If any of the keys in $keys are not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function getItems(array $keys = []);
-
-    /**
-     * Returns A json string that represents an array of items.
-     *
-     * @param array $keys
-     * An indexed array of keys of items to retrieve.
-     * @param int $option \json_encode() options
-     * @param int $depth \json_encode() depth
-     *
-     * @return string
-     * @throws InvalidArgumentException
-     *   If any of the keys in $keys are not a legal value a phpfastcacheInvalidArgumentException
-     *   MUST be thrown.
-     *
-     */
-    public function getItemsAsJsonString(array $keys = [], int $option = 0, int $depth = 512): string;
-
-    /**
-     * @param CacheItemInterface $item
-     * @return mixed
-     */
-    public function setItem(CacheItemInterface $item);
-
-    /**
-     * @return DriverStatistic
-     */
-    public function getStats(): DriverStatistic;
-
-    /**
-     * Get a quick help guide
-     * about the current driver
-     *
-     * @return string
-     */
-    public function getHelp(): string;
-
-    /**
-     * @param CacheItemInterface $item
-     * @return void
-     */
-    public function detachItem(CacheItemInterface $item);
-
-    /**
-     * @return void
-     */
-    public function detachAllItems();
-
-    /**
-     * @param CacheItemInterface $item
-     * @return void
-     * @throws PhpfastcacheLogicException
-     */
-    public function attachItem(CacheItemInterface $item);
-
-    /**
-     * Returns true if the item exists, is attached and the Spl Hash matches
-     * Returns false if the item exists, is attached and the Spl Hash mismatches
-     * Returns null if the item does not exists
-     *
-     * @param CacheItemInterface $item
-     * @return bool|null
-     * @throws PhpfastcacheLogicException
-     */
-    public function isAttached(CacheItemInterface $item);
-
-    /**
-     * Save multiple items, possible uses:
-     *  saveMultiple([$item1, $item2, $item3]);
-     *  saveMultiple($item1, $item2, $item3);
-     *
-     * @param ExtendedCacheItemInterface[] $items
-     * @return bool
-     */
-    public function saveMultiple(...$items): bool;
-
-
-    /**
-     * @return DriverIO
-     */
-    public function getIO(): DriverIO;
+	public const DRIVER_CONNECT_FAILURE = '%s failed to connect with the following error message: "%s" line %d in %s';
+
+	public const DRIVER_KEY_WRAPPER_INDEX = 'k';
+
+	public const DRIVER_DATA_WRAPPER_INDEX = 'd';
+
+	/**
+	 * Expiration date Index
+	 */
+	public const DRIVER_EDATE_WRAPPER_INDEX = 'e';
+
+	/**
+	 * Creation date Index
+	 */
+	public const DRIVER_CDATE_WRAPPER_INDEX = 'c';
+
+	/**
+	 * Modification date Index
+	 */
+	public const DRIVER_MDATE_WRAPPER_INDEX = 'm';
+
+	/**
+	 * Return the config class name
+	 * @return string
+	 */
+	public static function getConfigClass(): string;
+
+	/**
+	 * @return ConfigurationOption
+	 */
+	public function getConfig(): ConfigurationOption;
+
+	/**
+	 * @return ConfigurationOption
+	 */
+	public function getDefaultConfig(): ConfigurationOption;
+
+	/**
+	 * @return string
+	 */
+	public function getDriverName(): string;
+
+	/**
+	 * @return mixed
+	 */
+	public function getInstanceId(): string;
+
+	/**
+	 * [phpFastCache phpDoc Override]
+	 * Returns a Cache Item representing the specified key.
+	 *
+	 * This method must always return a CacheItemInterface object, even in case of
+	 * a cache miss. It MUST NOT return null.
+	 *
+	 * @param string $key
+	 *   The key for which to return the corresponding Cache Item.
+	 *
+	 * @return ExtendedCacheItemInterface
+	 *   The corresponding Cache Item.
+	 * @throws PhpfastcacheInvalidArgumentException
+	 *   If the $key string is not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function getItem($key);
+
+	/**
+	 * [phpFastCache phpDoc Override]
+	 * Returns a traversable set of cache items.
+	 *
+	 * @param array $keys
+	 * An indexed array of keys of items to retrieve.
+	 *
+	 * @return ExtendedCacheItemInterface[]
+	 *   A traversable collection of Cache Items keyed by the cache keys of
+	 *   each item. A Cache item will be returned for each key, even if that
+	 *   key is not found. However, if no keys are specified then an empty
+	 *   traversable MUST be returned instead.
+	 * @throws InvalidArgumentException
+	 *   If any of the keys in $keys are not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function getItems(array $keys = []);
+
+	/**
+	 * Returns A json string that represents an array of items.
+	 *
+	 * @param array $keys
+	 * An indexed array of keys of items to retrieve.
+	 * @param int $option \json_encode() options
+	 * @param int $depth \json_encode() depth
+	 *
+	 * @return string
+	 * @throws InvalidArgumentException
+	 *   If any of the keys in $keys are not a legal value a phpfastcacheInvalidArgumentException
+	 *   MUST be thrown.
+	 *
+	 */
+	public function getItemsAsJsonString(array $keys = [], int $option = 0, int $depth = 512): string;
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return mixed
+	 */
+	public function setItem(CacheItemInterface $item);
+
+	/**
+	 * @return DriverStatistic
+	 */
+	public function getStats(): DriverStatistic;
+
+	/**
+	 * Get a quick help guide
+	 * about the current driver
+	 *
+	 * @return string
+	 */
+	public function getHelp(): string;
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return void
+	 */
+	public function detachItem(CacheItemInterface $item);
+
+	/**
+	 * @return void
+	 */
+	public function detachAllItems();
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return void
+	 * @throws PhpfastcacheLogicException
+	 */
+	public function attachItem(CacheItemInterface $item);
+
+	/**
+	 * Returns true if the item exists, is attached and the Spl Hash matches
+	 * Returns false if the item exists, is attached and the Spl Hash mismatches
+	 * Returns null if the item does not exists
+	 *
+	 * @param CacheItemInterface $item
+	 * @return bool|null
+	 * @throws PhpfastcacheLogicException
+	 */
+	public function isAttached(CacheItemInterface $item);
+
+	/**
+	 * Save multiple items, possible uses:
+	 *  saveMultiple([$item1, $item2, $item3]);
+	 *  saveMultiple($item1, $item2, $item3);
+	 *
+	 * @param ExtendedCacheItemInterface[] $items
+	 * @return bool
+	 */
+	public function saveMultiple(...$items): bool;
+
+
+	/**
+	 * @return DriverIO
+	 */
+	public function getIO(): DriverIO;
 }

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Core/Pool/DriverBaseTrait.php

Indentation +214 added lines, -214 removed lines

@@ -31,218 +31,218 @@
  */
 trait DriverBaseTrait
 {
-    use ExtendedCacheItemPoolTrait;
-
-    /**
-     * @var ConfigurationOption the options
-     */
-    protected $config;
-
-    /**
-     * @var bool
-     */
-    protected $fallback = false;
-
-    /**
-     * @var object Instance of driver service
-     */
-    protected $instance;
-
-    /**
-     * @var string
-     */
-    protected $driverName;
-
-    /**
-     * @internal This variable is read-access only
-     * @var string
-     */
-    protected $instanceId;
-
-    /**
-     * Driver constructor.
-     * @param ConfigurationOption $config
-     * @param string $instanceId
-     * @throws PhpfastcacheDriverCheckException
-     * @throws PhpfastcacheDriverConnectException
-     */
-    public function __construct(ConfigurationOption $config, $instanceId)
-    {
-        $this->setConfig($config);
-        $this->instanceId = $instanceId;
-        $this->IO = new DriverIO();
-
-        if (!$this->driverCheck()) {
-            throw new PhpfastcacheDriverCheckException(\sprintf(self::DRIVER_CHECK_FAILURE, $this->getDriverName()));
-        }
-
-        try {
-            $this->driverConnect();
-        } catch (Exception $e) {
-            throw new PhpfastcacheDriverConnectException(
-                sprintf(
-                    self::DRIVER_CONNECT_FAILURE,
-                    $this->getDriverName(),
-                    $e->getMessage(),
-                    $e->getLine() ?: 'unknown line',
-                    $e->getFile() ?: 'unknown file'
-                )
-            );
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDriverName(): string
-    {
-        if (!$this->driverName) {
-            $this->driverName = \ucfirst(\substr(\strrchr((new ReflectionObject($this))->getNamespaceName(), '\\'), 1));
-        }
-        return $this->driverName;
-    }
-
-    /**
-     * @return ConfigurationOption
-     */
-    public function getDefaultConfig(): ConfigurationOption
-    {
-        $className = self::getConfigClass();
-        return new $className;
-    }
-
-    /**
-     * @return string
-     */
-    public static function getConfigClass(): string
-    {
-        $localConfigClass = \substr(static::class, 0, \strrpos(static::class, '\\')) . '\Config';
-        if (\class_exists($localConfigClass) && \is_a($localConfigClass, ConfigurationOption::class, true)) {
-            return $localConfigClass;
-        }
-        return ConfigurationOption::class;
-    }
-
-    /**
-     * @param ExtendedCacheItemInterface $item
-     * @return array
-     */
-    public function driverPreWrap(ExtendedCacheItemInterface $item): array
-    {
-        $wrap = [
-            self::DRIVER_KEY_WRAPPER_INDEX => $item->getKey(), // Stored but not really used, allow you to quickly identify the cache key
-            self::DRIVER_DATA_WRAPPER_INDEX => $item->get(),
-            self::DRIVER_TAGS_WRAPPER_INDEX => $item->getTags(),
-            self::DRIVER_EDATE_WRAPPER_INDEX => $item->getExpirationDate(),
-        ];
-
-        if ($this->getConfig()->isItemDetailedDate()) {
-            $wrap[self::DRIVER_MDATE_WRAPPER_INDEX] = new DateTime();
-            /**
-             * If the creation date exists
-             * reuse it else set a new Date
-             */
-            $wrap[self::DRIVER_CDATE_WRAPPER_INDEX] = $item->getCreationDate() ?: new DateTime();
-        } else {
-            $wrap[self::DRIVER_MDATE_WRAPPER_INDEX] = null;
-            $wrap[self::DRIVER_CDATE_WRAPPER_INDEX] = null;
-        }
-
-        return $wrap;
-    }
-
-    /**
-     * @return ConfigurationOption
-     */
-    public function getConfig(): ConfigurationOption
-    {
-        return $this->config;
-    }
-
-    /**
-     * @param ConfigurationOption $config
-     */
-    public function setConfig(ConfigurationOption $config)
-    {
-        $this->config = $config;
-    }
-
-    /**
-     * @param array $wrapper
-     * @return mixed
-     */
-    public function driverUnwrapData(array $wrapper)
-    {
-        return $wrapper[self::DRIVER_DATA_WRAPPER_INDEX];
-    }
-
-
-    /**
-     * @param array $wrapper
-     * @return DateTime
-     */
-    public function driverUnwrapEdate(array $wrapper)
-    {
-        return $wrapper[self::DRIVER_EDATE_WRAPPER_INDEX];
-    }
-
-    /**
-     * @param array $wrapper
-     * @return DateTime
-     */
-    public function driverUnwrapCdate(array $wrapper)
-    {
-        return $wrapper[self::DRIVER_CDATE_WRAPPER_INDEX];
-    }
-
-    /**
-     * @param array $wrapper
-     * @return DateTime
-     */
-    public function driverUnwrapMdate(array $wrapper)
-    {
-        return $wrapper[self::DRIVER_MDATE_WRAPPER_INDEX];
-    }
-
-    /**
-     * @return string
-     */
-    public function getInstanceId(): string
-    {
-        return $this->instanceId;
-    }
-
-
-    /**
-     * Encode data types such as object/array
-     * for driver that does not support
-     * non-scalar value
-     * @param $data
-     * @return string
-     */
-    protected function encode($data): string
-    {
-        return \serialize($data);
-    }
-
-    /**
-     * Decode data types such as object/array
-     * for driver that does not support
-     * non-scalar value
-     * @param string|null $value
-     * @return mixed
-     */
-    protected function decode($value)
-    {
-        return \unserialize((string)$value, ['allowed_classes' => true]);
-    }
-
-    /**
-     * Check if phpModule or CGI
-     * @return bool
-     */
-    protected function isPHPModule(): bool
-    {
-        return (\PHP_SAPI === 'apache2handler' || \strpos(\PHP_SAPI, 'handler') !== false);
-    }
+	use ExtendedCacheItemPoolTrait;
+
+	/**
+	 * @var ConfigurationOption the options
+	 */
+	protected $config;
+
+	/**
+	 * @var bool
+	 */
+	protected $fallback = false;
+
+	/**
+	 * @var object Instance of driver service
+	 */
+	protected $instance;
+
+	/**
+	 * @var string
+	 */
+	protected $driverName;
+
+	/**
+	 * @internal This variable is read-access only
+	 * @var string
+	 */
+	protected $instanceId;
+
+	/**
+	 * Driver constructor.
+	 * @param ConfigurationOption $config
+	 * @param string $instanceId
+	 * @throws PhpfastcacheDriverCheckException
+	 * @throws PhpfastcacheDriverConnectException
+	 */
+	public function __construct(ConfigurationOption $config, $instanceId)
+	{
+		$this->setConfig($config);
+		$this->instanceId = $instanceId;
+		$this->IO = new DriverIO();
+
+		if (!$this->driverCheck()) {
+			throw new PhpfastcacheDriverCheckException(\sprintf(self::DRIVER_CHECK_FAILURE, $this->getDriverName()));
+		}
+
+		try {
+			$this->driverConnect();
+		} catch (Exception $e) {
+			throw new PhpfastcacheDriverConnectException(
+				sprintf(
+					self::DRIVER_CONNECT_FAILURE,
+					$this->getDriverName(),
+					$e->getMessage(),
+					$e->getLine() ?: 'unknown line',
+					$e->getFile() ?: 'unknown file'
+				)
+			);
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDriverName(): string
+	{
+		if (!$this->driverName) {
+			$this->driverName = \ucfirst(\substr(\strrchr((new ReflectionObject($this))->getNamespaceName(), '\\'), 1));
+		}
+		return $this->driverName;
+	}
+
+	/**
+	 * @return ConfigurationOption
+	 */
+	public function getDefaultConfig(): ConfigurationOption
+	{
+		$className = self::getConfigClass();
+		return new $className;
+	}
+
+	/**
+	 * @return string
+	 */
+	public static function getConfigClass(): string
+	{
+		$localConfigClass = \substr(static::class, 0, \strrpos(static::class, '\\')) . '\Config';
+		if (\class_exists($localConfigClass) && \is_a($localConfigClass, ConfigurationOption::class, true)) {
+			return $localConfigClass;
+		}
+		return ConfigurationOption::class;
+	}
+
+	/**
+	 * @param ExtendedCacheItemInterface $item
+	 * @return array
+	 */
+	public function driverPreWrap(ExtendedCacheItemInterface $item): array
+	{
+		$wrap = [
+			self::DRIVER_KEY_WRAPPER_INDEX => $item->getKey(), // Stored but not really used, allow you to quickly identify the cache key
+			self::DRIVER_DATA_WRAPPER_INDEX => $item->get(),
+			self::DRIVER_TAGS_WRAPPER_INDEX => $item->getTags(),
+			self::DRIVER_EDATE_WRAPPER_INDEX => $item->getExpirationDate(),
+		];
+
+		if ($this->getConfig()->isItemDetailedDate()) {
+			$wrap[self::DRIVER_MDATE_WRAPPER_INDEX] = new DateTime();
+			/**
+			 * If the creation date exists
+			 * reuse it else set a new Date
+			 */
+			$wrap[self::DRIVER_CDATE_WRAPPER_INDEX] = $item->getCreationDate() ?: new DateTime();
+		} else {
+			$wrap[self::DRIVER_MDATE_WRAPPER_INDEX] = null;
+			$wrap[self::DRIVER_CDATE_WRAPPER_INDEX] = null;
+		}
+
+		return $wrap;
+	}
+
+	/**
+	 * @return ConfigurationOption
+	 */
+	public function getConfig(): ConfigurationOption
+	{
+		return $this->config;
+	}
+
+	/**
+	 * @param ConfigurationOption $config
+	 */
+	public function setConfig(ConfigurationOption $config)
+	{
+		$this->config = $config;
+	}
+
+	/**
+	 * @param array $wrapper
+	 * @return mixed
+	 */
+	public function driverUnwrapData(array $wrapper)
+	{
+		return $wrapper[self::DRIVER_DATA_WRAPPER_INDEX];
+	}
+
+
+	/**
+	 * @param array $wrapper
+	 * @return DateTime
+	 */
+	public function driverUnwrapEdate(array $wrapper)
+	{
+		return $wrapper[self::DRIVER_EDATE_WRAPPER_INDEX];
+	}
+
+	/**
+	 * @param array $wrapper
+	 * @return DateTime
+	 */
+	public function driverUnwrapCdate(array $wrapper)
+	{
+		return $wrapper[self::DRIVER_CDATE_WRAPPER_INDEX];
+	}
+
+	/**
+	 * @param array $wrapper
+	 * @return DateTime
+	 */
+	public function driverUnwrapMdate(array $wrapper)
+	{
+		return $wrapper[self::DRIVER_MDATE_WRAPPER_INDEX];
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getInstanceId(): string
+	{
+		return $this->instanceId;
+	}
+
+
+	/**
+	 * Encode data types such as object/array
+	 * for driver that does not support
+	 * non-scalar value
+	 * @param $data
+	 * @return string
+	 */
+	protected function encode($data): string
+	{
+		return \serialize($data);
+	}
+
+	/**
+	 * Decode data types such as object/array
+	 * for driver that does not support
+	 * non-scalar value
+	 * @param string|null $value
+	 * @return mixed
+	 */
+	protected function decode($value)
+	{
+		return \unserialize((string)$value, ['allowed_classes' => true]);
+	}
+
+	/**
+	 * Check if phpModule or CGI
+	 * @return bool
+	 */
+	protected function isPHPModule(): bool
+	{
+		return (\PHP_SAPI === 'apache2handler' || \strpos(\PHP_SAPI, 'handler') !== false);
+	}
 }

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Core/Pool/CacheItemPoolTrait.php

Indentation +405 added lines, -405 removed lines

@@ -39,413 +39,413 @@
  */
 trait CacheItemPoolTrait
 {
-    use ClassNamespaceResolverTrait;
-    use EventManagerDispatcherTrait;
-    use TaggableCacheItemPoolTrait;
-
-    /**
-     * @var string
-     */
-    protected static $unsupportedKeyChars = '{}()/\@:';
-
-    /**
-     * @var array
-     */
-    protected $deferredList = [];
-
-    /**
-     * @var ExtendedCacheItemInterface[]
-     */
-    protected $itemInstances = [];
-
-    /**CacheItemPoolTrait
+	use ClassNamespaceResolverTrait;
+	use EventManagerDispatcherTrait;
+	use TaggableCacheItemPoolTrait;
+
+	/**
+	 * @var string
+	 */
+	protected static $unsupportedKeyChars = '{}()/\@:';
+
+	/**
+	 * @var array
+	 */
+	protected $deferredList = [];
+
+	/**
+	 * @var ExtendedCacheItemInterface[]
+	 */
+	protected $itemInstances = [];
+
+	/**CacheItemPoolTrait
      * @param CacheItemInterface $item
      * @return $this
      * @throws PhpfastcacheInvalidArgumentException
      */
-    public function setItem(CacheItemInterface $item)
-    {
-        if ($this->getClassNamespace() . '\\Item' === \get_class($item)) {
-            if(!$this->getConfig()->isUseStaticItemCaching()){
-                throw new PhpfastcacheLogicException(
-                    'The static item caching option (useStaticItemCaching) is disabled so you cannot attach an item.'
-                );
-            }
-
-            $this->itemInstances[$item->getKey()] = $item;
-
-            return $this;
-        }
-        throw new PhpfastcacheInvalidArgumentException(
-            \sprintf(
-                'Invalid Item Class "%s" for this driver "%s".',
-                get_class($item),
-                get_class($this)
-            )
-        );
-    }
-
-    /**
-     * @param array $keys
-     * @return array
-     * @throws PhpfastcacheCoreException
-     * @throws PhpfastcacheInvalidArgumentException
-     * @throws PhpfastcacheLogicException
-     */
-    public function getItems(array $keys = [])
-    {
-        $collection = [];
-        foreach ($keys as $key) {
-            $collection[$key] = $this->getItem($key);
-        }
-
-        return $collection;
-    }
-
-    /**
-     * @param string $key
-     * @return ExtendedCacheItemInterface
-     * @throws PhpfastcacheInvalidArgumentException
-     * @throws PhpfastcacheLogicException
-     * @throws PhpfastcacheCoreException
-     */
-    public function getItem($key)
-    {
-        if (\is_string($key)) {
-            $item = null;
-
-            /**
-             * Replace array_key_exists by isset
-             * due to performance issue on huge
-             * loop dispatching operations
-             */
-            if (!isset($this->itemInstances[$key]) || !$this->getConfig()->isUseStaticItemCaching()) {
-                if (\preg_match('~([' . \preg_quote(self::$unsupportedKeyChars, '~') . ']+)~', $key, $matches)) {
-                    throw new PhpfastcacheInvalidArgumentException(
-                        'Unsupported key character detected: "' . $matches[1] . '". Please check: https://github.com/PHPSocialNetwork/phpfastcache/wiki/%5BV6%5D-Unsupported-characters-in-key-identifiers'
-                    );
-                }
-
-                $cacheSlamsSpendSeconds = 0;
-                $class = $this->getClassNamespace() . '\Item';
-                /** @var $item ExtendedCacheItemInterface */
-                $item = new $class($this, $key);
-                $item->setEventManager($this->eventManager);
-
-                getItemDriverRead:
-                {
-                    $driverArray = $this->driverRead($item);
-
-                    if ($driverArray) {
-                        if (!\is_array($driverArray)) {
-                            throw new PhpfastcacheCoreException(
-                                sprintf(
-                                    'The driverRead method returned an unexpected variable type: %s',
-                                    \gettype($driverArray)
-                                )
-                            );
-                        }
-                        $driverData = $this->driverUnwrapData($driverArray);
-
-                        if ($this->getConfig()['preventCacheSlams']) {
-                            while ($driverData instanceof ItemBatch) {
-                                if ($driverData->getItemDate()->getTimestamp() + $this->getConfig()->getCacheSlamsTimeout() < \time()) {
-                                    /**
-                                     * The timeout has been reached
-                                     * Consider that the batch has
-                                     * failed and serve an empty item
-                                     * to avoid to get stuck with a
-                                     * batch item stored in driver
-                                     */
-                                    goto getItemDriverExpired;
-                                }
-                                /**
-                                 * @eventName CacheGetItem
-                                 * @param $this ExtendedCacheItemPoolInterface
-                                 * @param $driverData ItemBatch
-                                 * @param $cacheSlamsSpendSeconds int
-                                 */
-                                $this->eventManager->dispatch('CacheGetItemInSlamBatch', $this, $driverData, $cacheSlamsSpendSeconds);
-
-                                /**
-                                 * Wait for a second before
-                                 * attempting to get exit
-                                 * the current batch process
-                                 */
-                                \sleep(1);
-                                $cacheSlamsSpendSeconds++;
-                                goto getItemDriverRead;
-                            }
-                        }
-
-                        $item->set($driverData);
-                        $item->expiresAt($this->driverUnwrapEdate($driverArray));
-
-                        if ($this->getConfig()->isItemDetailedDate()) {
-                            /**
-                             * If the itemDetailedDate has been
-                             * set after caching, we MUST inject
-                             * a new DateTime object on the fly
-                             */
-                            $item->setCreationDate($this->driverUnwrapCdate($driverArray) ?: new DateTime());
-                            $item->setModificationDate($this->driverUnwrapMdate($driverArray) ?: new DateTime());
-                        }
-
-                        $item->setTags($this->driverUnwrapTags($driverArray));
-
-                        getItemDriverExpired:
-                        if ($item->isExpired()) {
-                            /**
-                             * Using driverDelete() instead of delete()
-                             * to avoid infinite loop caused by
-                             * getItem() call in delete() method
-                             * As we MUST return an item in any
-                             * way, we do not de-register here
-                             */
-                            $this->driverDelete($item);
-
-                            /**
-                             * Reset the Item
-                             */
-                            $item->set(null)
-                                ->expiresAfter(abs((int)$this->getConfig()['defaultTtl']))
-                                ->setHit(false)
-                                ->setTags([]);
-                            if ($this->getConfig()->isItemDetailedDate()) {
-                                /**
-                                 * If the itemDetailedDate has been
-                                 * set after caching, we MUST inject
-                                 * a new DateTime object on the fly
-                                 */
-                                $item->setCreationDate(new DateTime());
-                                $item->setModificationDate(new DateTime());
-                            }
-                        } else {
-                            $item->setHit(true);
-                        }
-                    } else {
-                        $item->expiresAfter(abs((int)$this->getConfig()['defaultTtl']));
-                    }
-                }
-            }else{
-                $item = $this->itemInstances[$key];
-            }
-
-
-            if($item !== null){
-                /**
-                 * @eventName CacheGetItem
-                 * @param $this ExtendedCacheItemPoolInterface
-                 * @param $this ExtendedCacheItemInterface
-                 */
-                $this->eventManager->dispatch('CacheGetItem', $this, $item);
-
-                $item->isHit() ? $this->getIO()->incReadHit() : $this->getIO()->incReadMiss();
-
-                return $item;
-            }
-            throw new PhpfastcacheInvalidArgumentException(\sprintf('Item %s was not build due to an unknown error', \gettype($key)));
-        }
-        throw new PhpfastcacheInvalidArgumentException(\sprintf('$key must be a string, got type "%s" instead.', \gettype($key)));
-    }
-
-    /**
-     * @param string $key
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    public function hasItem($key)
-    {
-        return $this->getItem($key)->isHit();
-    }
-
-    /**
-     * @return bool
-     */
-    public function clear()
-    {
-        /**
-         * @eventName CacheClearItem
-         * @param $this ExtendedCacheItemPoolInterface
-         * @param $itemInstances ExtendedCacheItemInterface[]
-         */
-        $this->eventManager->dispatch('CacheClearItem', $this, $this->itemInstances);
-
-        $this->getIO()->incWriteHit();
-        // Faster than detachAllItems()
-        $this->itemInstances = [];
-
-        return $this->driverClear();
-    }
-
-    /**
-     * @param array $keys
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    public function deleteItems(array $keys)
-    {
-        $return = null;
-        foreach ($keys as $key) {
-            $result = $this->deleteItem($key);
-            if ($result !== false) {
-                $return = $result;
-            }
-        }
-
-        return (bool)$return;
-    }
-
-    /**
-     * @param string $key
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    public function deleteItem($key)
-    {
-        $item = $this->getItem($key);
-        if ($item->isHit() && $this->driverDelete($item)) {
-            $item->setHit(false);
-            $this->getIO()->incWriteHit();
-
-            /**
-             * @eventName CacheCommitItem
-             * @param $this ExtendedCacheItemPoolInterface
-             * @param $item ExtendedCacheItemInterface
-             */
-            $this->eventManager->dispatch('CacheDeleteItem', $this, $item);
-
-            /**
-             * De-register the item instance
-             * then collect gc cycles
-             */
-            $this->deregisterItem($key);
-
-            /**
-             * Perform a tag cleanup to avoid memory leaks
-             */
-            if (\strpos($key, self::DRIVER_TAGS_KEY_PREFIX) !== 0) {
-                $this->cleanItemTags($item);
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return CacheItemInterface
-     * @throws RuntimeException
-     */
-    public function saveDeferred(CacheItemInterface $item)
-    {
-        if (!\array_key_exists($item->getKey(), $this->itemInstances)) {
-            $this->itemInstances[$item->getKey()] = $item;
-        } else {
-            if (\spl_object_hash($item) !== \spl_object_hash($this->itemInstances[$item->getKey()])) {
-                throw new RuntimeException('Spl object hash mismatches ! You probably tried to save a detached item which has been already retrieved from cache.');
-            }
-        }
-
-        /**
-         * @eventName CacheSaveDeferredItem
-         * @param $this ExtendedCacheItemPoolInterface
-         * @param $this ExtendedCacheItemInterface
-         */
-        $this->eventManager->dispatch('CacheSaveDeferredItem', $this, $item);
-
-        return $this->deferredList[$item->getKey()] = $item;
-    }
-
-    /**
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    public function commit()
-    {
-        /**
-         * @eventName CacheCommitItem
-         * @param $this ExtendedCacheItemPoolInterface
-         * @param $deferredList ExtendedCacheItemInterface[]
-         */
-        $this->eventManager->dispatch('CacheCommitItem', $this, $this->deferredList);
-
-        $return = null;
-        foreach ($this->deferredList as $key => $item) {
-            $result = $this->save($item);
-            if ($return !== false) {
-                unset($this->deferredList[$key]);
-                $return = $result;
-            }
-        }
-
-        return (bool)$return;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     * @throws PhpfastcacheLogicException
-     * @throws \ReflectionException
-     */
-    public function save(CacheItemInterface $item)
-    {
-        /**
-         * @var ExtendedCacheItemInterface $item
-         *
-         * Replace array_key_exists by isset
-         * due to performance issue on huge
-         * loop dispatching operations
-         */
-        if (!isset($this->itemInstances[$item->getKey()])) {
-            if($this->getConfig()->isUseStaticItemCaching()){
-                $this->itemInstances[$item->getKey()] = $item;
-            }
-        } else {
-            if (\spl_object_hash($item) !== \spl_object_hash($this->itemInstances[$item->getKey()])) {
-                throw new RuntimeException('Spl object hash mismatches ! You probably tried to save a detached item which has been already retrieved from cache.');
-            }
-        }
-
-        /**
-         * @eventName CacheSaveItem
-         * @param $this ExtendedCacheItemPoolInterface
-         * @param $this ExtendedCacheItemInterface
-         */
-        $this->eventManager->dispatch('CacheSaveItem', $this, $item);
-
-
-        if ($this->getConfig()->isPreventCacheSlams()) {
-            /**
-             * @var $itemBatch ExtendedCacheItemInterface
-             */
-            $class = new ReflectionClass((new ReflectionObject($this))->getNamespaceName() . '\Item');
-            $itemBatch = $class->newInstanceArgs([$this, $item->getKey()]);
-            $itemBatch->setEventManager($this->eventManager)
-                ->set(new ItemBatch($item->getKey(), new DateTime()))
-                ->expiresAfter($this->getConfig()->getCacheSlamsTimeout());
-
-            /**
-             * To avoid SPL mismatches
-             * we have to re-attach the
-             * original item to the pool
-             */
-            $this->driverWrite($itemBatch);
-            $this->detachItem($itemBatch);
-            $this->attachItem($item);
-        }
-
-
-        if ($this->driverWrite($item) && $this->driverWriteTags($item)) {
-            $item->setHit(true);
-            $this->getIO()->incWriteHit();
-
-            return true;
-        }
-
-        return false;
-    }
+	public function setItem(CacheItemInterface $item)
+	{
+		if ($this->getClassNamespace() . '\\Item' === \get_class($item)) {
+			if(!$this->getConfig()->isUseStaticItemCaching()){
+				throw new PhpfastcacheLogicException(
+					'The static item caching option (useStaticItemCaching) is disabled so you cannot attach an item.'
+				);
+			}
+
+			$this->itemInstances[$item->getKey()] = $item;
+
+			return $this;
+		}
+		throw new PhpfastcacheInvalidArgumentException(
+			\sprintf(
+				'Invalid Item Class "%s" for this driver "%s".',
+				get_class($item),
+				get_class($this)
+			)
+		);
+	}
+
+	/**
+	 * @param array $keys
+	 * @return array
+	 * @throws PhpfastcacheCoreException
+	 * @throws PhpfastcacheInvalidArgumentException
+	 * @throws PhpfastcacheLogicException
+	 */
+	public function getItems(array $keys = [])
+	{
+		$collection = [];
+		foreach ($keys as $key) {
+			$collection[$key] = $this->getItem($key);
+		}
+
+		return $collection;
+	}
+
+	/**
+	 * @param string $key
+	 * @return ExtendedCacheItemInterface
+	 * @throws PhpfastcacheInvalidArgumentException
+	 * @throws PhpfastcacheLogicException
+	 * @throws PhpfastcacheCoreException
+	 */
+	public function getItem($key)
+	{
+		if (\is_string($key)) {
+			$item = null;
+
+			/**
+			 * Replace array_key_exists by isset
+			 * due to performance issue on huge
+			 * loop dispatching operations
+			 */
+			if (!isset($this->itemInstances[$key]) || !$this->getConfig()->isUseStaticItemCaching()) {
+				if (\preg_match('~([' . \preg_quote(self::$unsupportedKeyChars, '~') . ']+)~', $key, $matches)) {
+					throw new PhpfastcacheInvalidArgumentException(
+						'Unsupported key character detected: "' . $matches[1] . '". Please check: https://github.com/PHPSocialNetwork/phpfastcache/wiki/%5BV6%5D-Unsupported-characters-in-key-identifiers'
+					);
+				}
+
+				$cacheSlamsSpendSeconds = 0;
+				$class = $this->getClassNamespace() . '\Item';
+				/** @var $item ExtendedCacheItemInterface */
+				$item = new $class($this, $key);
+				$item->setEventManager($this->eventManager);
+
+				getItemDriverRead:
+				{
+					$driverArray = $this->driverRead($item);
+
+					if ($driverArray) {
+						if (!\is_array($driverArray)) {
+							throw new PhpfastcacheCoreException(
+								sprintf(
+									'The driverRead method returned an unexpected variable type: %s',
+									\gettype($driverArray)
+								)
+							);
+						}
+						$driverData = $this->driverUnwrapData($driverArray);
+
+						if ($this->getConfig()['preventCacheSlams']) {
+							while ($driverData instanceof ItemBatch) {
+								if ($driverData->getItemDate()->getTimestamp() + $this->getConfig()->getCacheSlamsTimeout() < \time()) {
+									/**
+									 * The timeout has been reached
+									 * Consider that the batch has
+									 * failed and serve an empty item
+									 * to avoid to get stuck with a
+									 * batch item stored in driver
+									 */
+									goto getItemDriverExpired;
+								}
+								/**
+								 * @eventName CacheGetItem
+								 * @param $this ExtendedCacheItemPoolInterface
+								 * @param $driverData ItemBatch
+								 * @param $cacheSlamsSpendSeconds int
+								 */
+								$this->eventManager->dispatch('CacheGetItemInSlamBatch', $this, $driverData, $cacheSlamsSpendSeconds);
+
+								/**
+								 * Wait for a second before
+								 * attempting to get exit
+								 * the current batch process
+								 */
+								\sleep(1);
+								$cacheSlamsSpendSeconds++;
+								goto getItemDriverRead;
+							}
+						}
+
+						$item->set($driverData);
+						$item->expiresAt($this->driverUnwrapEdate($driverArray));
+
+						if ($this->getConfig()->isItemDetailedDate()) {
+							/**
+							 * If the itemDetailedDate has been
+							 * set after caching, we MUST inject
+							 * a new DateTime object on the fly
+							 */
+							$item->setCreationDate($this->driverUnwrapCdate($driverArray) ?: new DateTime());
+							$item->setModificationDate($this->driverUnwrapMdate($driverArray) ?: new DateTime());
+						}
+
+						$item->setTags($this->driverUnwrapTags($driverArray));
+
+						getItemDriverExpired:
+						if ($item->isExpired()) {
+							/**
+							 * Using driverDelete() instead of delete()
+							 * to avoid infinite loop caused by
+							 * getItem() call in delete() method
+							 * As we MUST return an item in any
+							 * way, we do not de-register here
+							 */
+							$this->driverDelete($item);
+
+							/**
+							 * Reset the Item
+							 */
+							$item->set(null)
+								->expiresAfter(abs((int)$this->getConfig()['defaultTtl']))
+								->setHit(false)
+								->setTags([]);
+							if ($this->getConfig()->isItemDetailedDate()) {
+								/**
+								 * If the itemDetailedDate has been
+								 * set after caching, we MUST inject
+								 * a new DateTime object on the fly
+								 */
+								$item->setCreationDate(new DateTime());
+								$item->setModificationDate(new DateTime());
+							}
+						} else {
+							$item->setHit(true);
+						}
+					} else {
+						$item->expiresAfter(abs((int)$this->getConfig()['defaultTtl']));
+					}
+				}
+			}else{
+				$item = $this->itemInstances[$key];
+			}
+
+
+			if($item !== null){
+				/**
+				 * @eventName CacheGetItem
+				 * @param $this ExtendedCacheItemPoolInterface
+				 * @param $this ExtendedCacheItemInterface
+				 */
+				$this->eventManager->dispatch('CacheGetItem', $this, $item);
+
+				$item->isHit() ? $this->getIO()->incReadHit() : $this->getIO()->incReadMiss();
+
+				return $item;
+			}
+			throw new PhpfastcacheInvalidArgumentException(\sprintf('Item %s was not build due to an unknown error', \gettype($key)));
+		}
+		throw new PhpfastcacheInvalidArgumentException(\sprintf('$key must be a string, got type "%s" instead.', \gettype($key)));
+	}
+
+	/**
+	 * @param string $key
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	public function hasItem($key)
+	{
+		return $this->getItem($key)->isHit();
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function clear()
+	{
+		/**
+		 * @eventName CacheClearItem
+		 * @param $this ExtendedCacheItemPoolInterface
+		 * @param $itemInstances ExtendedCacheItemInterface[]
+		 */
+		$this->eventManager->dispatch('CacheClearItem', $this, $this->itemInstances);
+
+		$this->getIO()->incWriteHit();
+		// Faster than detachAllItems()
+		$this->itemInstances = [];
+
+		return $this->driverClear();
+	}
+
+	/**
+	 * @param array $keys
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	public function deleteItems(array $keys)
+	{
+		$return = null;
+		foreach ($keys as $key) {
+			$result = $this->deleteItem($key);
+			if ($result !== false) {
+				$return = $result;
+			}
+		}
+
+		return (bool)$return;
+	}
+
+	/**
+	 * @param string $key
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	public function deleteItem($key)
+	{
+		$item = $this->getItem($key);
+		if ($item->isHit() && $this->driverDelete($item)) {
+			$item->setHit(false);
+			$this->getIO()->incWriteHit();
+
+			/**
+			 * @eventName CacheCommitItem
+			 * @param $this ExtendedCacheItemPoolInterface
+			 * @param $item ExtendedCacheItemInterface
+			 */
+			$this->eventManager->dispatch('CacheDeleteItem', $this, $item);
+
+			/**
+			 * De-register the item instance
+			 * then collect gc cycles
+			 */
+			$this->deregisterItem($key);
+
+			/**
+			 * Perform a tag cleanup to avoid memory leaks
+			 */
+			if (\strpos($key, self::DRIVER_TAGS_KEY_PREFIX) !== 0) {
+				$this->cleanItemTags($item);
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return CacheItemInterface
+	 * @throws RuntimeException
+	 */
+	public function saveDeferred(CacheItemInterface $item)
+	{
+		if (!\array_key_exists($item->getKey(), $this->itemInstances)) {
+			$this->itemInstances[$item->getKey()] = $item;
+		} else {
+			if (\spl_object_hash($item) !== \spl_object_hash($this->itemInstances[$item->getKey()])) {
+				throw new RuntimeException('Spl object hash mismatches ! You probably tried to save a detached item which has been already retrieved from cache.');
+			}
+		}
+
+		/**
+		 * @eventName CacheSaveDeferredItem
+		 * @param $this ExtendedCacheItemPoolInterface
+		 * @param $this ExtendedCacheItemInterface
+		 */
+		$this->eventManager->dispatch('CacheSaveDeferredItem', $this, $item);
+
+		return $this->deferredList[$item->getKey()] = $item;
+	}
+
+	/**
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	public function commit()
+	{
+		/**
+		 * @eventName CacheCommitItem
+		 * @param $this ExtendedCacheItemPoolInterface
+		 * @param $deferredList ExtendedCacheItemInterface[]
+		 */
+		$this->eventManager->dispatch('CacheCommitItem', $this, $this->deferredList);
+
+		$return = null;
+		foreach ($this->deferredList as $key => $item) {
+			$result = $this->save($item);
+			if ($return !== false) {
+				unset($this->deferredList[$key]);
+				$return = $result;
+			}
+		}
+
+		return (bool)$return;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 * @throws PhpfastcacheLogicException
+	 * @throws \ReflectionException
+	 */
+	public function save(CacheItemInterface $item)
+	{
+		/**
+		 * @var ExtendedCacheItemInterface $item
+		 *
+		 * Replace array_key_exists by isset
+		 * due to performance issue on huge
+		 * loop dispatching operations
+		 */
+		if (!isset($this->itemInstances[$item->getKey()])) {
+			if($this->getConfig()->isUseStaticItemCaching()){
+				$this->itemInstances[$item->getKey()] = $item;
+			}
+		} else {
+			if (\spl_object_hash($item) !== \spl_object_hash($this->itemInstances[$item->getKey()])) {
+				throw new RuntimeException('Spl object hash mismatches ! You probably tried to save a detached item which has been already retrieved from cache.');
+			}
+		}
+
+		/**
+		 * @eventName CacheSaveItem
+		 * @param $this ExtendedCacheItemPoolInterface
+		 * @param $this ExtendedCacheItemInterface
+		 */
+		$this->eventManager->dispatch('CacheSaveItem', $this, $item);
+
+
+		if ($this->getConfig()->isPreventCacheSlams()) {
+			/**
+			 * @var $itemBatch ExtendedCacheItemInterface
+			 */
+			$class = new ReflectionClass((new ReflectionObject($this))->getNamespaceName() . '\Item');
+			$itemBatch = $class->newInstanceArgs([$this, $item->getKey()]);
+			$itemBatch->setEventManager($this->eventManager)
+				->set(new ItemBatch($item->getKey(), new DateTime()))
+				->expiresAfter($this->getConfig()->getCacheSlamsTimeout());
+
+			/**
+			 * To avoid SPL mismatches
+			 * we have to re-attach the
+			 * original item to the pool
+			 */
+			$this->driverWrite($itemBatch);
+			$this->detachItem($itemBatch);
+			$this->attachItem($item);
+		}
+
+
+		if ($this->driverWrite($item) && $this->driverWriteTags($item)) {
+			$item->setHit(true);
+			$this->getIO()->incWriteHit();
+
+			return true;
+		}
+
+		return false;
+	}
 }