grommunio / grommunio-web

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

Spacing +8 added lines, -8 removed lines

@@ -66,7 +66,7 @@ 
     public function setItem(CacheItemInterface $item)
     {
         if ($this->getClassNamespace() . '\\Item' === \get_class($item)) {
-            if(!$this->getConfig()->isUseStaticItemCaching()){
+            if (!$this->getConfig()->isUseStaticItemCaching()) {
                 throw new PhpfastcacheLogicException(
                     'The static item caching option (useStaticItemCaching) is disabled so you cannot attach an item.'
                 );
@@ -208,7 +208,7 @@ 
                              * Reset the Item
                              */
                             $item->set(null)
-                                ->expiresAfter(abs((int)$this->getConfig()['defaultTtl']))
+                                ->expiresAfter(abs((int) $this->getConfig()['defaultTtl']))
                                 ->setHit(false)
                                 ->setTags([]);
                             if ($this->getConfig()->isItemDetailedDate()) {
@@ -224,15 +224,15 @@ 
                             $item->setHit(true);
                         }
                     } else {
-                        $item->expiresAfter(abs((int)$this->getConfig()['defaultTtl']));
+                        $item->expiresAfter(abs((int) $this->getConfig()['defaultTtl']));
                     }
                 }
-            }else{
+            } else {
                 $item = $this->itemInstances[$key];
             }
 
 
-            if($item !== null){
+            if ($item !== null) {
                 /**
                  * @eventName CacheGetItem
                  * @param $this ExtendedCacheItemPoolInterface
@@ -293,7 +293,7 @@ 
             }
         }
 
-        return (bool)$return;
+        return (bool) $return;
     }
 
     /**
@@ -381,7 +381,7 @@ 
             }
         }
 
-        return (bool)$return;
+        return (bool) $return;
     }
 
     /**
@@ -401,7 +401,7 @@ 
          * loop dispatching operations
          */
         if (!isset($this->itemInstances[$item->getKey()])) {
-            if($this->getConfig()->isUseStaticItemCaching()){
+            if ($this->getConfig()->isUseStaticItemCaching()) {
                 $this->itemInstances[$item->getKey()] = $item;
             }
         } else {

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;
+	}
 }

Braces +20 added lines, -25 removed lines

@@ -63,8 +63,7 @@ 
      * @return $this
      * @throws PhpfastcacheInvalidArgumentException
      */
-    public function setItem(CacheItemInterface $item)
-    {
+    public function setItem(CacheItemInterface $item) {
         if ($this->getClassNamespace() . '\\Item' === \get_class($item)) {
             if(!$this->getConfig()->isUseStaticItemCaching()){
                 throw new PhpfastcacheLogicException(
@@ -92,8 +91,7 @@ 
      * @throws PhpfastcacheInvalidArgumentException
      * @throws PhpfastcacheLogicException
      */
-    public function getItems(array $keys = [])
-    {
+    public function getItems(array $keys = []) {
         $collection = [];
         foreach ($keys as $key) {
             $collection[$key] = $this->getItem($key);
@@ -109,8 +107,7 @@ 
      * @throws PhpfastcacheLogicException
      * @throws PhpfastcacheCoreException
      */
-    public function getItem($key)
-    {
+    public function getItem($key) {
         if (\is_string($key)) {
             $item = null;
 
@@ -220,14 +217,17 @@ 
                                 $item->setCreationDate(new DateTime());
                                 $item->setModificationDate(new DateTime());
                             }
-                        } else {
+                        }
+                        else {
                             $item->setHit(true);
                         }
-                    } else {
+                    }
+                    else {
                         $item->expiresAfter(abs((int)$this->getConfig()['defaultTtl']));
                     }
                 }
-            }else{
+            }
+            else{
                 $item = $this->itemInstances[$key];
             }
 
@@ -254,16 +254,14 @@ 
      * @return bool
      * @throws PhpfastcacheInvalidArgumentException
      */
-    public function hasItem($key)
-    {
+    public function hasItem($key) {
         return $this->getItem($key)->isHit();
     }
 
     /**
      * @return bool
      */
-    public function clear()
-    {
+    public function clear() {
         /**
          * @eventName CacheClearItem
          * @param $this ExtendedCacheItemPoolInterface
@@ -283,8 +281,7 @@ 
      * @return bool
      * @throws PhpfastcacheInvalidArgumentException
      */
-    public function deleteItems(array $keys)
-    {
+    public function deleteItems(array $keys) {
         $return = null;
         foreach ($keys as $key) {
             $result = $this->deleteItem($key);
@@ -301,8 +298,7 @@ 
      * @return bool
      * @throws PhpfastcacheInvalidArgumentException
      */
-    public function deleteItem($key)
-    {
+    public function deleteItem($key) {
         $item = $this->getItem($key);
         if ($item->isHit() && $this->driverDelete($item)) {
             $item->setHit(false);
@@ -339,11 +335,11 @@ 
      * @return CacheItemInterface
      * @throws RuntimeException
      */
-    public function saveDeferred(CacheItemInterface $item)
-    {
+    public function saveDeferred(CacheItemInterface $item) {
         if (!\array_key_exists($item->getKey(), $this->itemInstances)) {
             $this->itemInstances[$item->getKey()] = $item;
-        } else {
+        }
+        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.');
             }
@@ -363,8 +359,7 @@ 
      * @return bool
      * @throws PhpfastcacheInvalidArgumentException
      */
-    public function commit()
-    {
+    public function commit() {
         /**
          * @eventName CacheCommitItem
          * @param $this ExtendedCacheItemPoolInterface
@@ -391,8 +386,7 @@ 
      * @throws PhpfastcacheLogicException
      * @throws \ReflectionException
      */
-    public function save(CacheItemInterface $item)
-    {
+    public function save(CacheItemInterface $item) {
         /**
          * @var ExtendedCacheItemInterface $item
          *
@@ -404,7 +398,8 @@ 
             if($this->getConfig()->isUseStaticItemCaching()){
                 $this->itemInstances[$item->getKey()] = $item;
             }
-        } else {
+        }
+        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.');
             }

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Cluster/ClusterPoolAbstract.php

Spacing +5 added lines, -5 removed lines

@@ -200,7 +200,7 @@ 
                 \implode(
                     ', ',
                     \array_map(
-                        static function (ExtendedCacheItemPoolInterface $pool) {
+                        static function(ExtendedCacheItemPoolInterface $pool) {
                             return \get_class($pool);
                         },
                         $this->clusterPools
@@ -210,9 +210,9 @@ 
         );
 
         $stats->setSize(
-            (int)\array_sum(
+            (int) \array_sum(
                 \array_map(
-                    static function (ExtendedCacheItemPoolInterface $pool) {
+                    static function(ExtendedCacheItemPoolInterface $pool) {
                         return $pool->getStats()->getSize();
                     },
                     $this->clusterPools
@@ -221,8 +221,8 @@ 
         );
 
         $stats->setData(
-            (int)\array_map(
-                static function (ExtendedCacheItemPoolInterface $pool) {
+            (int) \array_map(
+                static function(ExtendedCacheItemPoolInterface $pool) {
                     return $pool->getStats()->getData();
                 },
                 $this->clusterPools

Indentation +195 added lines, -195 removed lines

@@ -16,9 +16,9 @@ 
 namespace Phpfastcache\Cluster;
 
 use Phpfastcache\Cluster\Drivers\{FullReplication\FullReplicationCluster,
-    MasterSlaveReplication\MasterSlaveReplicationCluster,
-    RandomReplication\RandomReplicationCluster,
-    SemiReplication\SemiReplicationCluster
+	MasterSlaveReplication\MasterSlaveReplicationCluster,
+	RandomReplication\RandomReplicationCluster,
+	SemiReplication\SemiReplicationCluster
 };
 use Phpfastcache\Config\ConfigurationOption;
 use Phpfastcache\Core\{Item\ExtendedCacheItemInterface, Pool\DriverBaseTrait, Pool\ExtendedCacheItemPoolInterface};
@@ -39,196 +39,196 @@ 
  */
 abstract class ClusterPoolAbstract implements ClusterPoolInterface
 {
-    use DriverBaseTrait;
-    use ClusterPoolTrait {
-        DriverBaseTrait::__construct as private __parentConstruct;
-    }
-
-    public const STRATEGY = [
-        AggregatorInterface::STRATEGY_FULL_REPLICATION => FullReplicationCluster::class,
-        AggregatorInterface::STRATEGY_SEMI_REPLICATION => SemiReplicationCluster::class,
-        AggregatorInterface::STRATEGY_MASTER_SLAVE => MasterSlaveReplicationCluster::class,
-        AggregatorInterface::STRATEGY_RANDOM_REPLICATION => RandomReplicationCluster::class,
-    ];
-
-    /**
-     * @var ExtendedCacheItemPoolInterface[]
-     */
-    protected $clusterPools;
-
-    /**
-     * ClusterPoolAbstract constructor.
-     * @param string $clusterName
-     * @param ExtendedCacheItemPoolInterface ...$driverPools
-     * @throws PhpfastcacheInvalidArgumentException
-     * @throws PhpfastcacheDriverCheckException
-     * @throws PhpfastcacheDriverConnectException
-     * @throws PhpfastcacheInvalidConfigurationException
-     * @throws ReflectionException
-     */
-    public function __construct(string $clusterName, ExtendedCacheItemPoolInterface ...$driverPools)
-    {
-        if (count($driverPools) < 2) {
-            throw new PhpfastcacheInvalidArgumentException('A cluster requires at least two pools to be working.');
-        }
-        $this->clusterPools = $driverPools;
-        $this->__parentConstruct(new ConfigurationOption(), $clusterName);
-        $this->setEventManager(EventManager::getInstance());
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getIO(): DriverIO
-    {
-        $IO = new DriverIO();
-        foreach ($this->clusterPools as $clusterPool) {
-            $IO->setReadHit($IO->getReadHit() + $clusterPool->getIO()->getReadHit())
-                ->setReadMiss($IO->getReadMiss() + $clusterPool->getIO()->getReadMiss())
-                ->setWriteHit($IO->getWriteHit() + $clusterPool->getIO()->getWriteHit());
-        }
-        return $IO;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getClusterPools(): array
-    {
-        return $this->clusterPools;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getItems(array $keys = [])
-    {
-        $items = [];
-
-        foreach ($keys as $key) {
-            $items[$key] = $this->getItem($key);
-        }
-
-        return $items;
-    }
-    /**
-     * Shared method used by All Clusters
-     */
-
-    /**
-     * @inheritDoc
-     */
-    public function deleteItems(array $keys)
-    {
-        $hasDeletedOnce = false;
-        foreach ($this->clusterPools as $driverPool) {
-            if ($result = $driverPool->deleteItems($keys)) {
-                $hasDeletedOnce = $result;
-            }
-        }
-        // Return true only if at least one backend confirmed the "clear" operation
-        return $hasDeletedOnce;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function saveDeferred(CacheItemInterface $item)
-    {
-        /** @var ExtendedCacheItemInterface $item */
-        $hasSavedOnce = false;
-        foreach ($this->clusterPools as $driverPool) {
-            $poolItem = $this->getStandardizedItem($item, $driverPool);
-            if ($result = $driverPool->saveDeferred($poolItem)) {
-                $hasSavedOnce = $result;
-            }
-        }
-        // Return true only if at least one backend confirmed the "commit" operation
-        return $hasSavedOnce;
-    }
-
-    /**
-     * @param ExtendedCacheItemInterface $item
-     * @param ExtendedCacheItemPoolInterface $driverPool
-     * @return CacheItemInterface
-     * @throws InvalidArgumentException
-     */
-    protected function getStandardizedItem(ExtendedCacheItemInterface $item, ExtendedCacheItemPoolInterface $driverPool): CacheItemInterface
-    {
-        if (!$item->doesItemBelongToThatDriverBackend($driverPool)) {
-            /**
-             * Avoid infinite loop
-             */
-            if ($driverPool === $this) {
-                /** @var ExtendedCacheItemInterface $itemPool */
-                $itemClass = $driverPool->getClassNamespace() . '\\' . 'Item';
-                $itemPool = new $itemClass($this, $item->getKey());
-                $itemPool->setEventManager($this->getEventManager())
-                    ->set($item->get())
-                    ->setHit($item->isHit())
-                    ->setTags($item->getTags())
-                    ->expiresAt($item->getExpirationDate())
-                    ->setDriver($driverPool);
-                return $itemPool;
-            }
-            return $driverPool->getItem($item->getKey())
-                ->setEventManager($this->getEventManager())
-                ->set($item->get())
-                ->setHit($item->isHit())
-                ->setTags($item->getTags())
-                ->expiresAt($item->getExpirationDate())
-                ->setDriver($driverPool);
-        }
-
-        return $item->setEventManager($this->getEventManager());
-    }
-
-    /**
-     * Interfaced methods that needs to be faked
-     */
-
-    /**
-     * @return DriverStatistic
-     */
-    public function getStats(): DriverStatistic
-    {
-        $stats = new DriverStatistic();
-        $stats->setInfo(
-            sprintf(
-                'Using %d pool(s): %s',
-                \count($this->clusterPools),
-                \implode(
-                    ', ',
-                    \array_map(
-                        static function (ExtendedCacheItemPoolInterface $pool) {
-                            return \get_class($pool);
-                        },
-                        $this->clusterPools
-                    )
-                )
-            )
-        );
-
-        $stats->setSize(
-            (int)\array_sum(
-                \array_map(
-                    static function (ExtendedCacheItemPoolInterface $pool) {
-                        return $pool->getStats()->getSize();
-                    },
-                    $this->clusterPools
-                )
-            )
-        );
-
-        $stats->setData(
-            (int)\array_map(
-                static function (ExtendedCacheItemPoolInterface $pool) {
-                    return $pool->getStats()->getData();
-                },
-                $this->clusterPools
-            )
-        );
-
-        return $stats;
-    }
+	use DriverBaseTrait;
+	use ClusterPoolTrait {
+		DriverBaseTrait::__construct as private __parentConstruct;
+	}
+
+	public const STRATEGY = [
+		AggregatorInterface::STRATEGY_FULL_REPLICATION => FullReplicationCluster::class,
+		AggregatorInterface::STRATEGY_SEMI_REPLICATION => SemiReplicationCluster::class,
+		AggregatorInterface::STRATEGY_MASTER_SLAVE => MasterSlaveReplicationCluster::class,
+		AggregatorInterface::STRATEGY_RANDOM_REPLICATION => RandomReplicationCluster::class,
+	];
+
+	/**
+	 * @var ExtendedCacheItemPoolInterface[]
+	 */
+	protected $clusterPools;
+
+	/**
+	 * ClusterPoolAbstract constructor.
+	 * @param string $clusterName
+	 * @param ExtendedCacheItemPoolInterface ...$driverPools
+	 * @throws PhpfastcacheInvalidArgumentException
+	 * @throws PhpfastcacheDriverCheckException
+	 * @throws PhpfastcacheDriverConnectException
+	 * @throws PhpfastcacheInvalidConfigurationException
+	 * @throws ReflectionException
+	 */
+	public function __construct(string $clusterName, ExtendedCacheItemPoolInterface ...$driverPools)
+	{
+		if (count($driverPools) < 2) {
+			throw new PhpfastcacheInvalidArgumentException('A cluster requires at least two pools to be working.');
+		}
+		$this->clusterPools = $driverPools;
+		$this->__parentConstruct(new ConfigurationOption(), $clusterName);
+		$this->setEventManager(EventManager::getInstance());
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getIO(): DriverIO
+	{
+		$IO = new DriverIO();
+		foreach ($this->clusterPools as $clusterPool) {
+			$IO->setReadHit($IO->getReadHit() + $clusterPool->getIO()->getReadHit())
+				->setReadMiss($IO->getReadMiss() + $clusterPool->getIO()->getReadMiss())
+				->setWriteHit($IO->getWriteHit() + $clusterPool->getIO()->getWriteHit());
+		}
+		return $IO;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getClusterPools(): array
+	{
+		return $this->clusterPools;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getItems(array $keys = [])
+	{
+		$items = [];
+
+		foreach ($keys as $key) {
+			$items[$key] = $this->getItem($key);
+		}
+
+		return $items;
+	}
+	/**
+	 * Shared method used by All Clusters
+	 */
+
+	/**
+	 * @inheritDoc
+	 */
+	public function deleteItems(array $keys)
+	{
+		$hasDeletedOnce = false;
+		foreach ($this->clusterPools as $driverPool) {
+			if ($result = $driverPool->deleteItems($keys)) {
+				$hasDeletedOnce = $result;
+			}
+		}
+		// Return true only if at least one backend confirmed the "clear" operation
+		return $hasDeletedOnce;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function saveDeferred(CacheItemInterface $item)
+	{
+		/** @var ExtendedCacheItemInterface $item */
+		$hasSavedOnce = false;
+		foreach ($this->clusterPools as $driverPool) {
+			$poolItem = $this->getStandardizedItem($item, $driverPool);
+			if ($result = $driverPool->saveDeferred($poolItem)) {
+				$hasSavedOnce = $result;
+			}
+		}
+		// Return true only if at least one backend confirmed the "commit" operation
+		return $hasSavedOnce;
+	}
+
+	/**
+	 * @param ExtendedCacheItemInterface $item
+	 * @param ExtendedCacheItemPoolInterface $driverPool
+	 * @return CacheItemInterface
+	 * @throws InvalidArgumentException
+	 */
+	protected function getStandardizedItem(ExtendedCacheItemInterface $item, ExtendedCacheItemPoolInterface $driverPool): CacheItemInterface
+	{
+		if (!$item->doesItemBelongToThatDriverBackend($driverPool)) {
+			/**
+			 * Avoid infinite loop
+			 */
+			if ($driverPool === $this) {
+				/** @var ExtendedCacheItemInterface $itemPool */
+				$itemClass = $driverPool->getClassNamespace() . '\\' . 'Item';
+				$itemPool = new $itemClass($this, $item->getKey());
+				$itemPool->setEventManager($this->getEventManager())
+					->set($item->get())
+					->setHit($item->isHit())
+					->setTags($item->getTags())
+					->expiresAt($item->getExpirationDate())
+					->setDriver($driverPool);
+				return $itemPool;
+			}
+			return $driverPool->getItem($item->getKey())
+				->setEventManager($this->getEventManager())
+				->set($item->get())
+				->setHit($item->isHit())
+				->setTags($item->getTags())
+				->expiresAt($item->getExpirationDate())
+				->setDriver($driverPool);
+		}
+
+		return $item->setEventManager($this->getEventManager());
+	}
+
+	/**
+	 * Interfaced methods that needs to be faked
+	 */
+
+	/**
+	 * @return DriverStatistic
+	 */
+	public function getStats(): DriverStatistic
+	{
+		$stats = new DriverStatistic();
+		$stats->setInfo(
+			sprintf(
+				'Using %d pool(s): %s',
+				\count($this->clusterPools),
+				\implode(
+					', ',
+					\array_map(
+						static function (ExtendedCacheItemPoolInterface $pool) {
+							return \get_class($pool);
+						},
+						$this->clusterPools
+					)
+				)
+			)
+		);
+
+		$stats->setSize(
+			(int)\array_sum(
+				\array_map(
+					static function (ExtendedCacheItemPoolInterface $pool) {
+						return $pool->getStats()->getSize();
+					},
+					$this->clusterPools
+				)
+			)
+		);
+
+		$stats->setData(
+			(int)\array_map(
+				static function (ExtendedCacheItemPoolInterface $pool) {
+					return $pool->getStats()->getData();
+				},
+				$this->clusterPools
+			)
+		);
+
+		return $stats;
+	}
 }

Braces +4 added lines, -8 removed lines

@@ -66,8 +66,7 @@ 
      * @throws PhpfastcacheInvalidConfigurationException
      * @throws ReflectionException
      */
-    public function __construct(string $clusterName, ExtendedCacheItemPoolInterface ...$driverPools)
-    {
+    public function __construct(string $clusterName, ExtendedCacheItemPoolInterface ...$driverPools) {
         if (count($driverPools) < 2) {
             throw new PhpfastcacheInvalidArgumentException('A cluster requires at least two pools to be working.');
         }
@@ -101,8 +100,7 @@ 
     /**
      * @inheritDoc
      */
-    public function getItems(array $keys = [])
-    {
+    public function getItems(array $keys = []) {
         $items = [];
 
         foreach ($keys as $key) {
@@ -118,8 +116,7 @@ 
     /**
      * @inheritDoc
      */
-    public function deleteItems(array $keys)
-    {
+    public function deleteItems(array $keys) {
         $hasDeletedOnce = false;
         foreach ($this->clusterPools as $driverPool) {
             if ($result = $driverPool->deleteItems($keys)) {
@@ -133,8 +130,7 @@ 
     /**
      * @inheritDoc
      */
-    public function saveDeferred(CacheItemInterface $item)
-    {
+    public function saveDeferred(CacheItemInterface $item) {
         /** @var ExtendedCacheItemInterface $item */
         $hasSavedOnce = false;
         foreach ($this->clusterPools as $driverPool) {

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Cluster/Drivers/MasterSlaveReplication/MasterSlaveReplicationCluster.php

Spacing +6 added lines, -6 removed lines

@@ -59,7 +59,7 @@ 
     {
         return $this->getStandardizedItem(
             $this->makeOperation(
-                static function (ExtendedCacheItemPoolInterface $pool) use ($key) {
+                static function(ExtendedCacheItemPoolInterface $pool) use ($key) {
                     return $pool->getItem($key);
                 }
             ) ?? new Item($this, $key),
@@ -112,7 +112,7 @@ 
     public function hasItem($key)
     {
         return $this->makeOperation(
-            static function (ExtendedCacheItemPoolInterface $pool) use ($key) {
+            static function(ExtendedCacheItemPoolInterface $pool) use ($key) {
                 return $pool->hasItem($key);
             }
         );
@@ -124,7 +124,7 @@ 
     public function clear()
     {
         return $this->makeOperation(
-            static function (ExtendedCacheItemPoolInterface $pool) {
+            static function(ExtendedCacheItemPoolInterface $pool) {
                 return $pool->clear();
             }
         );
@@ -136,7 +136,7 @@ 
     public function deleteItem($key)
     {
         return $this->makeOperation(
-            static function (ExtendedCacheItemPoolInterface $pool) use ($key) {
+            static function(ExtendedCacheItemPoolInterface $pool) use ($key) {
                 return $pool->deleteItem($key);
             }
         );
@@ -148,7 +148,7 @@ 
     public function save(CacheItemInterface $item)
     {
         return $this->makeOperation(
-            function (ExtendedCacheItemPoolInterface $pool) use ($item) {
+            function(ExtendedCacheItemPoolInterface $pool) use ($item) {
                 $item->setHit(true);
                 return $pool->save($this->getStandardizedItem($item, $pool));
             }
@@ -162,7 +162,7 @@ 
     public function commit()
     {
         return $this->makeOperation(
-            static function (ExtendedCacheItemPoolInterface $pool) {
+            static function(ExtendedCacheItemPoolInterface $pool) {
                 return $pool->commit();
             }
         );

Indentation +134 added lines, -134 removed lines

@@ -33,138 +33,138 @@
  */
 class MasterSlaveReplicationCluster extends ClusterPoolAbstract
 {
-    /**
-     * MasterSlaveReplicationCluster constructor.
-     * @param string $clusterName
-     * @param ExtendedCacheItemPoolInterface ...$driverPools
-     * @throws PhpfastcacheInvalidArgumentException
-     * @throws PhpfastcacheDriverCheckException
-     * @throws PhpfastcacheDriverConnectException
-     * @throws PhpfastcacheInvalidConfigurationException
-     * @throws ReflectionException
-     */
-    public function __construct(string $clusterName, ExtendedCacheItemPoolInterface ...$driverPools)
-    {
-        if (\count($driverPools) !== 2) {
-            throw new PhpfastcacheInvalidArgumentException('A "master/slave" cluster requires exactly two pools to be working.');
-        }
-
-        parent::__construct($clusterName, ...$driverPools);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getItem($key)
-    {
-        return $this->getStandardizedItem(
-            $this->makeOperation(
-                static function (ExtendedCacheItemPoolInterface $pool) use ($key) {
-                    return $pool->getItem($key);
-                }
-            ) ?? new Item($this, $key),
-            $this
-        );
-    }
-
-    /**
-     * @param callable $operation
-     * @return mixed
-     * @throws PhpfastcacheReplicationException
-     */
-    protected function makeOperation(callable $operation)
-    {
-        try {
-            return $operation($this->getMasterPool());
-        } catch (PhpfastcacheExceptionInterface $e) {
-            try {
-                $this->eventManager->dispatch(
-                    'CacheReplicationSlaveFallback',
-                    $this,
-                    \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['function']
-                );
-                return $operation($this->getSlavePool());
-            } catch (PhpfastcacheExceptionInterface $e) {
-                throw new PhpfastcacheReplicationException('Master and Slave thrown an exception !');
-            }
-        }
-    }
-
-    /**
-     * @return ExtendedCacheItemPoolInterface
-     */
-    protected function getMasterPool(): ExtendedCacheItemPoolInterface
-    {
-        return $this->clusterPools[0];
-    }
-
-    /**
-     * @return ExtendedCacheItemPoolInterface
-     */
-    protected function getSlavePool(): ExtendedCacheItemPoolInterface
-    {
-        return $this->clusterPools[1];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function hasItem($key)
-    {
-        return $this->makeOperation(
-            static function (ExtendedCacheItemPoolInterface $pool) use ($key) {
-                return $pool->hasItem($key);
-            }
-        );
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function clear()
-    {
-        return $this->makeOperation(
-            static function (ExtendedCacheItemPoolInterface $pool) {
-                return $pool->clear();
-            }
-        );
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function deleteItem($key)
-    {
-        return $this->makeOperation(
-            static function (ExtendedCacheItemPoolInterface $pool) use ($key) {
-                return $pool->deleteItem($key);
-            }
-        );
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function save(CacheItemInterface $item)
-    {
-        return $this->makeOperation(
-            function (ExtendedCacheItemPoolInterface $pool) use ($item) {
-                $item->setHit(true);
-                return $pool->save($this->getStandardizedItem($item, $pool));
-            }
-        );
-    }
-
-
-    /**
-     * @inheritDoc
-     */
-    public function commit()
-    {
-        return $this->makeOperation(
-            static function (ExtendedCacheItemPoolInterface $pool) {
-                return $pool->commit();
-            }
-        );
-    }
+	/**
+	 * MasterSlaveReplicationCluster constructor.
+	 * @param string $clusterName
+	 * @param ExtendedCacheItemPoolInterface ...$driverPools
+	 * @throws PhpfastcacheInvalidArgumentException
+	 * @throws PhpfastcacheDriverCheckException
+	 * @throws PhpfastcacheDriverConnectException
+	 * @throws PhpfastcacheInvalidConfigurationException
+	 * @throws ReflectionException
+	 */
+	public function __construct(string $clusterName, ExtendedCacheItemPoolInterface ...$driverPools)
+	{
+		if (\count($driverPools) !== 2) {
+			throw new PhpfastcacheInvalidArgumentException('A "master/slave" cluster requires exactly two pools to be working.');
+		}
+
+		parent::__construct($clusterName, ...$driverPools);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getItem($key)
+	{
+		return $this->getStandardizedItem(
+			$this->makeOperation(
+				static function (ExtendedCacheItemPoolInterface $pool) use ($key) {
+					return $pool->getItem($key);
+				}
+			) ?? new Item($this, $key),
+			$this
+		);
+	}
+
+	/**
+	 * @param callable $operation
+	 * @return mixed
+	 * @throws PhpfastcacheReplicationException
+	 */
+	protected function makeOperation(callable $operation)
+	{
+		try {
+			return $operation($this->getMasterPool());
+		} catch (PhpfastcacheExceptionInterface $e) {
+			try {
+				$this->eventManager->dispatch(
+					'CacheReplicationSlaveFallback',
+					$this,
+					\debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['function']
+				);
+				return $operation($this->getSlavePool());
+			} catch (PhpfastcacheExceptionInterface $e) {
+				throw new PhpfastcacheReplicationException('Master and Slave thrown an exception !');
+			}
+		}
+	}
+
+	/**
+	 * @return ExtendedCacheItemPoolInterface
+	 */
+	protected function getMasterPool(): ExtendedCacheItemPoolInterface
+	{
+		return $this->clusterPools[0];
+	}
+
+	/**
+	 * @return ExtendedCacheItemPoolInterface
+	 */
+	protected function getSlavePool(): ExtendedCacheItemPoolInterface
+	{
+		return $this->clusterPools[1];
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function hasItem($key)
+	{
+		return $this->makeOperation(
+			static function (ExtendedCacheItemPoolInterface $pool) use ($key) {
+				return $pool->hasItem($key);
+			}
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function clear()
+	{
+		return $this->makeOperation(
+			static function (ExtendedCacheItemPoolInterface $pool) {
+				return $pool->clear();
+			}
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function deleteItem($key)
+	{
+		return $this->makeOperation(
+			static function (ExtendedCacheItemPoolInterface $pool) use ($key) {
+				return $pool->deleteItem($key);
+			}
+		);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function save(CacheItemInterface $item)
+	{
+		return $this->makeOperation(
+			function (ExtendedCacheItemPoolInterface $pool) use ($item) {
+				$item->setHit(true);
+				return $pool->save($this->getStandardizedItem($item, $pool));
+			}
+		);
+	}
+
+
+	/**
+	 * @inheritDoc
+	 */
+	public function commit()
+	{
+		return $this->makeOperation(
+			static function (ExtendedCacheItemPoolInterface $pool) {
+				return $pool->commit();
+			}
+		);
+	}
 }

Braces +12 added lines, -18 removed lines

@@ -43,8 +43,7 @@ 
      * @throws PhpfastcacheInvalidConfigurationException
      * @throws ReflectionException
      */
-    public function __construct(string $clusterName, ExtendedCacheItemPoolInterface ...$driverPools)
-    {
+    public function __construct(string $clusterName, ExtendedCacheItemPoolInterface ...$driverPools) {
         if (\count($driverPools) !== 2) {
             throw new PhpfastcacheInvalidArgumentException('A "master/slave" cluster requires exactly two pools to be working.');
         }
@@ -55,8 +54,7 @@ 
     /**
      * @inheritDoc
      */
-    public function getItem($key)
-    {
+    public function getItem($key) {
         return $this->getStandardizedItem(
             $this->makeOperation(
                 static function (ExtendedCacheItemPoolInterface $pool) use ($key) {
@@ -72,11 +70,11 @@ 
      * @return mixed
      * @throws PhpfastcacheReplicationException
      */
-    protected function makeOperation(callable $operation)
-    {
+    protected function makeOperation(callable $operation) {
         try {
             return $operation($this->getMasterPool());
-        } catch (PhpfastcacheExceptionInterface $e) {
+        }
+        catch (PhpfastcacheExceptionInterface $e) {
             try {
                 $this->eventManager->dispatch(
                     'CacheReplicationSlaveFallback',
@@ -84,7 +82,8 @@ 
                     \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['function']
                 );
                 return $operation($this->getSlavePool());
-            } catch (PhpfastcacheExceptionInterface $e) {
+            }
+            catch (PhpfastcacheExceptionInterface $e) {
                 throw new PhpfastcacheReplicationException('Master and Slave thrown an exception !');
             }
         }
@@ -109,8 +108,7 @@ 
     /**
      * @inheritDoc
      */
-    public function hasItem($key)
-    {
+    public function hasItem($key) {
         return $this->makeOperation(
             static function (ExtendedCacheItemPoolInterface $pool) use ($key) {
                 return $pool->hasItem($key);
@@ -121,8 +119,7 @@ 
     /**
      * @inheritDoc
      */
-    public function clear()
-    {
+    public function clear() {
         return $this->makeOperation(
             static function (ExtendedCacheItemPoolInterface $pool) {
                 return $pool->clear();
@@ -133,8 +130,7 @@ 
     /**
      * @inheritDoc
      */
-    public function deleteItem($key)
-    {
+    public function deleteItem($key) {
         return $this->makeOperation(
             static function (ExtendedCacheItemPoolInterface $pool) use ($key) {
                 return $pool->deleteItem($key);
@@ -145,8 +141,7 @@ 
     /**
      * @inheritDoc
      */
-    public function save(CacheItemInterface $item)
-    {
+    public function save(CacheItemInterface $item) {
         return $this->makeOperation(
             function (ExtendedCacheItemPoolInterface $pool) use ($item) {
                 $item->setHit(true);
@@ -159,8 +154,7 @@ 
     /**
      * @inheritDoc
      */
-    public function commit()
-    {
+    public function commit() {
         return $this->makeOperation(
             static function (ExtendedCacheItemPoolInterface $pool) {
                 return $pool->commit();

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Config/ConfigurationOption.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
     public function __construct(...$args)
     {
         parent::__construct(...$args);
-        $array =& $this->getArray();
+        $array = & $this->getArray();
 
         /**
          * Detect unwanted keys and throw an exception.

Indentation +357 added lines, -357 removed lines

@@ -29,361 +29,361 @@
  */
 class ConfigurationOption extends ArrayObject implements ConfigurationOptionInterface
 {
-    /**
-     * @var bool
-     */
-    protected $itemDetailedDate = false;
-
-    /**
-     * @var bool
-     */
-    protected $autoTmpFallback = false;
-
-    /**
-     * @var int
-     */
-    protected $defaultTtl = 900;
-
-    /**
-     * @var string|Callable
-     */
-    protected $defaultKeyHashFunction = 'md5';
-
-    /**
-     * @var string|Callable
-     */
-    protected $defaultFileNameHashFunction = 'md5';
-
-    /**
-     * @var int
-     */
-    protected $defaultChmod = 0777;
-
-    /**
-     * @var string
-     */
-    protected $path = '';
-
-    /**
-     * @var int
-     */
-    protected $limitedMemoryByObject = 4096;
-
-    /**
-     * @var bool
-     */
-    protected $compressData = false;
-
-    /**
-     * @var bool
-     */
-    protected $preventCacheSlams = false;
-
-    /**
-     * @var int
-     */
-    protected $cacheSlamsTimeout = 15;
-
-    /**
-     * @var bool
-     */
-    protected $useStaticItemCaching = true;
-
-    /**
-     * @param $args
-     * ArrayObject constructor.
-     * @throws PhpfastcacheInvalidConfigurationException
-     * @throws ReflectionException
-     */
-    public function __construct(...$args)
-    {
-        parent::__construct(...$args);
-        $array =& $this->getArray();
-
-        /**
-         * Detect unwanted keys and throw an exception.
-         * No more kidding now, it's 21th century.
-         */
-        if (\array_diff_key($array, \get_object_vars($this))) {
-            throw new PhpfastcacheInvalidConfigurationException(
-                sprintf(
-                    'Invalid option(s) for the config %s: %s',
-                    static::class,
-                    \implode(', ', \array_keys(\array_diff_key($array, \get_object_vars($this))))
-                )
-            );
-        }
-
-        foreach (\get_object_vars($this) as $property => $value) {
-            if (\array_key_exists($property, $array)) {
-                $this->$property = &$array[$property];
-            } else {
-                $array[$property] = &$this->$property;
-            }
-        }
-
-        foreach (\get_class_methods($this) as $method) {
-            if (\strpos($method, 'set') === 0) {
-                $value = null;
-                try {
-                    /**
-                     * We use property instead of getter
-                     * because of is/get conditions and
-                     * to allow us to retrieve the value
-                     * in catch statement block
-                     */
-                    $value = $this->{\lcfirst(\substr($method, 3))};
-                    $this->{$method}($value);
-                } catch (TypeError $e) {
-                    $typeHintGot = \is_object($value) ? \get_class($value) : \gettype($value);
-                    $reflectionMethod = new ReflectionMethod($this, $method);
-                    $parameter = $reflectionMethod->getParameters()[0] ?? null;
-                    $typeHintExpected = ($parameter instanceof ReflectionParameter ? ($parameter->getType()->getName() === 'object' ? $parameter->getClass() : $parameter->getType(
-                    )->getName()) : 'Unknown type');
-
-                    throw new PhpfastcacheInvalidConfigurationException(
-                        \sprintf(
-                            'Invalid type hint found for "%s", expected "%s" got "%s"',
-                            \lcfirst(\substr($method, 3)),
-                            $typeHintExpected,
-                            $typeHintGot
-                        )
-                    );
-                }
-            }
-        }
-    }
-
-    /**
-     * @param string $optionName
-     * @return mixed|null
-     */
-    public function isValidOption(string $optionName)
-    {
-        return property_exists($this, $optionName);
-    }
-
-    /**
-     * @return bool
-     */
-    public function isItemDetailedDate(): bool
-    {
-        return $this->itemDetailedDate;
-    }
-
-    /**
-     * @param bool $itemDetailedDate
-     * @return ConfigurationOption
-     */
-    public function setItemDetailedDate(bool $itemDetailedDate): self
-    {
-        $this->itemDetailedDate = $itemDetailedDate;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isAutoTmpFallback(): bool
-    {
-        return $this->autoTmpFallback;
-    }
-
-    /**
-     * @param bool $autoTmpFallback
-     * @return ConfigurationOption
-     */
-    public function setAutoTmpFallback(bool $autoTmpFallback): self
-    {
-        $this->autoTmpFallback = $autoTmpFallback;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getDefaultTtl(): int
-    {
-        return $this->defaultTtl;
-    }
-
-    /**
-     * @param int $defaultTtl
-     * @return ConfigurationOption
-     */
-    public function setDefaultTtl(int $defaultTtl): self
-    {
-        $this->defaultTtl = $defaultTtl;
-        return $this;
-    }
-
-    /**
-     * @return Callable|string
-     */
-    public function getDefaultKeyHashFunction()
-    {
-        return $this->defaultKeyHashFunction;
-    }
-
-    /**
-     * @param Callable|string $defaultKeyHashFunction
-     * @return ConfigurationOption
-     * @throws  PhpfastcacheInvalidConfigurationException
-     */
-    public function setDefaultKeyHashFunction($defaultKeyHashFunction): self
-    {
-        if ($defaultKeyHashFunction && !\is_callable($defaultKeyHashFunction) && (\is_string($defaultKeyHashFunction) && !\function_exists($defaultKeyHashFunction))) {
-            throw new PhpfastcacheInvalidConfigurationException('defaultKeyHashFunction must be a valid function name string');
-        }
-        $this->defaultKeyHashFunction = $defaultKeyHashFunction;
-        return $this;
-    }
-
-    /**
-     * @return Callable|string
-     */
-    public function getDefaultFileNameHashFunction()
-    {
-        return $this->defaultFileNameHashFunction;
-    }
-
-    /**
-     * @param Callable|string $defaultFileNameHashFunction
-     * @return ConfigurationOption
-     * @throws  PhpfastcacheInvalidConfigurationException
-     */
-    public function setDefaultFileNameHashFunction($defaultFileNameHashFunction): self
-    {
-        if (!\is_callable($defaultFileNameHashFunction) && (\is_string($defaultFileNameHashFunction) && !\function_exists($defaultFileNameHashFunction))) {
-            throw new PhpfastcacheInvalidConfigurationException('defaultFileNameHashFunction must be a valid function name string');
-        }
-        $this->defaultFileNameHashFunction = $defaultFileNameHashFunction;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getDefaultChmod(): int
-    {
-        return $this->defaultChmod;
-    }
-
-    /**
-     * @param int $defaultChmod
-     * @return ConfigurationOption
-     */
-    public function setDefaultChmod(int $defaultChmod): self
-    {
-        $this->defaultChmod = $defaultChmod;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPath(): string
-    {
-        return $this->path;
-    }
-
-    /**
-     * @param string $path
-     * @return ConfigurationOption
-     */
-    public function setPath(string $path): self
-    {
-        $this->path = $path;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getLimitedMemoryByObject(): int
-    {
-        return $this->limitedMemoryByObject;
-    }
-
-    /**
-     * @param int $limitedMemoryByObject
-     * @return ConfigurationOption
-     */
-    public function setLimitedMemoryByObject(int $limitedMemoryByObject): self
-    {
-        $this->limitedMemoryByObject = $limitedMemoryByObject;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isCompressData(): bool
-    {
-        return $this->compressData;
-    }
-
-    /**
-     * @param bool $compressData
-     * @return ConfigurationOption
-     */
-    public function setCompressData(bool $compressData): self
-    {
-        $this->compressData = $compressData;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isPreventCacheSlams(): bool
-    {
-        return $this->preventCacheSlams;
-    }
-
-    /**
-     * @param bool $preventCacheSlams
-     * @return ConfigurationOption
-     */
-    public function setPreventCacheSlams(bool $preventCacheSlams): self
-    {
-        $this->preventCacheSlams = $preventCacheSlams;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCacheSlamsTimeout(): int
-    {
-        return $this->cacheSlamsTimeout;
-    }
-
-    /**
-     * @param int $cacheSlamsTimeout
-     * @return ConfigurationOption
-     */
-    public function setCacheSlamsTimeout(int $cacheSlamsTimeout): self
-    {
-        $this->cacheSlamsTimeout = $cacheSlamsTimeout;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isUseStaticItemCaching(): bool
-    {
-        return $this->useStaticItemCaching;
-    }
-
-    /**
-     * @param bool $useStaticItemCaching
-     * @return ConfigurationOption
-     */
-    public function setUseStaticItemCaching(bool $useStaticItemCaching): self
-    {
-        $this->useStaticItemCaching = $useStaticItemCaching;
-        return $this;
-    }
+	/**
+	 * @var bool
+	 */
+	protected $itemDetailedDate = false;
+
+	/**
+	 * @var bool
+	 */
+	protected $autoTmpFallback = false;
+
+	/**
+	 * @var int
+	 */
+	protected $defaultTtl = 900;
+
+	/**
+	 * @var string|Callable
+	 */
+	protected $defaultKeyHashFunction = 'md5';
+
+	/**
+	 * @var string|Callable
+	 */
+	protected $defaultFileNameHashFunction = 'md5';
+
+	/**
+	 * @var int
+	 */
+	protected $defaultChmod = 0777;
+
+	/**
+	 * @var string
+	 */
+	protected $path = '';
+
+	/**
+	 * @var int
+	 */
+	protected $limitedMemoryByObject = 4096;
+
+	/**
+	 * @var bool
+	 */
+	protected $compressData = false;
+
+	/**
+	 * @var bool
+	 */
+	protected $preventCacheSlams = false;
+
+	/**
+	 * @var int
+	 */
+	protected $cacheSlamsTimeout = 15;
+
+	/**
+	 * @var bool
+	 */
+	protected $useStaticItemCaching = true;
+
+	/**
+	 * @param $args
+	 * ArrayObject constructor.
+	 * @throws PhpfastcacheInvalidConfigurationException
+	 * @throws ReflectionException
+	 */
+	public function __construct(...$args)
+	{
+		parent::__construct(...$args);
+		$array =& $this->getArray();
+
+		/**
+		 * Detect unwanted keys and throw an exception.
+		 * No more kidding now, it's 21th century.
+		 */
+		if (\array_diff_key($array, \get_object_vars($this))) {
+			throw new PhpfastcacheInvalidConfigurationException(
+				sprintf(
+					'Invalid option(s) for the config %s: %s',
+					static::class,
+					\implode(', ', \array_keys(\array_diff_key($array, \get_object_vars($this))))
+				)
+			);
+		}
+
+		foreach (\get_object_vars($this) as $property => $value) {
+			if (\array_key_exists($property, $array)) {
+				$this->$property = &$array[$property];
+			} else {
+				$array[$property] = &$this->$property;
+			}
+		}
+
+		foreach (\get_class_methods($this) as $method) {
+			if (\strpos($method, 'set') === 0) {
+				$value = null;
+				try {
+					/**
+					 * We use property instead of getter
+					 * because of is/get conditions and
+					 * to allow us to retrieve the value
+					 * in catch statement block
+					 */
+					$value = $this->{\lcfirst(\substr($method, 3))};
+					$this->{$method}($value);
+				} catch (TypeError $e) {
+					$typeHintGot = \is_object($value) ? \get_class($value) : \gettype($value);
+					$reflectionMethod = new ReflectionMethod($this, $method);
+					$parameter = $reflectionMethod->getParameters()[0] ?? null;
+					$typeHintExpected = ($parameter instanceof ReflectionParameter ? ($parameter->getType()->getName() === 'object' ? $parameter->getClass() : $parameter->getType(
+					)->getName()) : 'Unknown type');
+
+					throw new PhpfastcacheInvalidConfigurationException(
+						\sprintf(
+							'Invalid type hint found for "%s", expected "%s" got "%s"',
+							\lcfirst(\substr($method, 3)),
+							$typeHintExpected,
+							$typeHintGot
+						)
+					);
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param string $optionName
+	 * @return mixed|null
+	 */
+	public function isValidOption(string $optionName)
+	{
+		return property_exists($this, $optionName);
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isItemDetailedDate(): bool
+	{
+		return $this->itemDetailedDate;
+	}
+
+	/**
+	 * @param bool $itemDetailedDate
+	 * @return ConfigurationOption
+	 */
+	public function setItemDetailedDate(bool $itemDetailedDate): self
+	{
+		$this->itemDetailedDate = $itemDetailedDate;
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isAutoTmpFallback(): bool
+	{
+		return $this->autoTmpFallback;
+	}
+
+	/**
+	 * @param bool $autoTmpFallback
+	 * @return ConfigurationOption
+	 */
+	public function setAutoTmpFallback(bool $autoTmpFallback): self
+	{
+		$this->autoTmpFallback = $autoTmpFallback;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getDefaultTtl(): int
+	{
+		return $this->defaultTtl;
+	}
+
+	/**
+	 * @param int $defaultTtl
+	 * @return ConfigurationOption
+	 */
+	public function setDefaultTtl(int $defaultTtl): self
+	{
+		$this->defaultTtl = $defaultTtl;
+		return $this;
+	}
+
+	/**
+	 * @return Callable|string
+	 */
+	public function getDefaultKeyHashFunction()
+	{
+		return $this->defaultKeyHashFunction;
+	}
+
+	/**
+	 * @param Callable|string $defaultKeyHashFunction
+	 * @return ConfigurationOption
+	 * @throws  PhpfastcacheInvalidConfigurationException
+	 */
+	public function setDefaultKeyHashFunction($defaultKeyHashFunction): self
+	{
+		if ($defaultKeyHashFunction && !\is_callable($defaultKeyHashFunction) && (\is_string($defaultKeyHashFunction) && !\function_exists($defaultKeyHashFunction))) {
+			throw new PhpfastcacheInvalidConfigurationException('defaultKeyHashFunction must be a valid function name string');
+		}
+		$this->defaultKeyHashFunction = $defaultKeyHashFunction;
+		return $this;
+	}
+
+	/**
+	 * @return Callable|string
+	 */
+	public function getDefaultFileNameHashFunction()
+	{
+		return $this->defaultFileNameHashFunction;
+	}
+
+	/**
+	 * @param Callable|string $defaultFileNameHashFunction
+	 * @return ConfigurationOption
+	 * @throws  PhpfastcacheInvalidConfigurationException
+	 */
+	public function setDefaultFileNameHashFunction($defaultFileNameHashFunction): self
+	{
+		if (!\is_callable($defaultFileNameHashFunction) && (\is_string($defaultFileNameHashFunction) && !\function_exists($defaultFileNameHashFunction))) {
+			throw new PhpfastcacheInvalidConfigurationException('defaultFileNameHashFunction must be a valid function name string');
+		}
+		$this->defaultFileNameHashFunction = $defaultFileNameHashFunction;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getDefaultChmod(): int
+	{
+		return $this->defaultChmod;
+	}
+
+	/**
+	 * @param int $defaultChmod
+	 * @return ConfigurationOption
+	 */
+	public function setDefaultChmod(int $defaultChmod): self
+	{
+		$this->defaultChmod = $defaultChmod;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getPath(): string
+	{
+		return $this->path;
+	}
+
+	/**
+	 * @param string $path
+	 * @return ConfigurationOption
+	 */
+	public function setPath(string $path): self
+	{
+		$this->path = $path;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getLimitedMemoryByObject(): int
+	{
+		return $this->limitedMemoryByObject;
+	}
+
+	/**
+	 * @param int $limitedMemoryByObject
+	 * @return ConfigurationOption
+	 */
+	public function setLimitedMemoryByObject(int $limitedMemoryByObject): self
+	{
+		$this->limitedMemoryByObject = $limitedMemoryByObject;
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isCompressData(): bool
+	{
+		return $this->compressData;
+	}
+
+	/**
+	 * @param bool $compressData
+	 * @return ConfigurationOption
+	 */
+	public function setCompressData(bool $compressData): self
+	{
+		$this->compressData = $compressData;
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isPreventCacheSlams(): bool
+	{
+		return $this->preventCacheSlams;
+	}
+
+	/**
+	 * @param bool $preventCacheSlams
+	 * @return ConfigurationOption
+	 */
+	public function setPreventCacheSlams(bool $preventCacheSlams): self
+	{
+		$this->preventCacheSlams = $preventCacheSlams;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getCacheSlamsTimeout(): int
+	{
+		return $this->cacheSlamsTimeout;
+	}
+
+	/**
+	 * @param int $cacheSlamsTimeout
+	 * @return ConfigurationOption
+	 */
+	public function setCacheSlamsTimeout(int $cacheSlamsTimeout): self
+	{
+		$this->cacheSlamsTimeout = $cacheSlamsTimeout;
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isUseStaticItemCaching(): bool
+	{
+		return $this->useStaticItemCaching;
+	}
+
+	/**
+	 * @param bool $useStaticItemCaching
+	 * @return ConfigurationOption
+	 */
+	public function setUseStaticItemCaching(bool $useStaticItemCaching): self
+	{
+		$this->useStaticItemCaching = $useStaticItemCaching;
+		return $this;
+	}
 }

Braces +8 added lines, -10 removed lines

@@ -95,8 +95,7 @@ 
      * @throws PhpfastcacheInvalidConfigurationException
      * @throws ReflectionException
      */
-    public function __construct(...$args)
-    {
+    public function __construct(...$args) {
         parent::__construct(...$args);
         $array =& $this->getArray();
 
@@ -117,7 +116,8 @@ 
         foreach (\get_object_vars($this) as $property => $value) {
             if (\array_key_exists($property, $array)) {
                 $this->$property = &$array[$property];
-            } else {
+            }
+            else {
                 $array[$property] = &$this->$property;
             }
         }
@@ -134,7 +134,8 @@ 
                      */
                     $value = $this->{\lcfirst(\substr($method, 3))};
                     $this->{$method}($value);
-                } catch (TypeError $e) {
+                }
+                catch (TypeError $e) {
                     $typeHintGot = \is_object($value) ? \get_class($value) : \gettype($value);
                     $reflectionMethod = new ReflectionMethod($this, $method);
                     $parameter = $reflectionMethod->getParameters()[0] ?? null;
@@ -158,8 +159,7 @@ 
      * @param string $optionName
      * @return mixed|null
      */
-    public function isValidOption(string $optionName)
-    {
+    public function isValidOption(string $optionName) {
         return property_exists($this, $optionName);
     }
 
@@ -220,8 +220,7 @@ 
     /**
      * @return Callable|string
      */
-    public function getDefaultKeyHashFunction()
-    {
+    public function getDefaultKeyHashFunction() {
         return $this->defaultKeyHashFunction;
     }
 
@@ -242,8 +241,7 @@ 
     /**
      * @return Callable|string
      */
-    public function getDefaultFileNameHashFunction()
-    {
+    public function getDefaultFileNameHashFunction() {
         return $this->defaultFileNameHashFunction;
     }
 

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Drivers/Couchdb/Config.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
     public function setDatabase(string $database): Config
     {
         /** @see https://docs.couchdb.org/en/latest/api/database/common.html#put--db */
-        if(\preg_match('#^[a-z][a-z0-9_\-+\$()/]+$#', $database)){
+        if (\preg_match('#^[a-z][a-z0-9_\-+\$()/]+$#', $database)) {
             $this->database = $database;
             return $this;
         }

Indentation +165 added lines, -165 removed lines

@@ -21,169 +21,169 @@
 
 class Config extends ConfigurationOption
 {
-    /**
-     * @var string
-     */
-    protected $host = '127.0.0.1';
-
-    /**
-     * @var int
-     */
-    protected $port = 5984;
-
-    /**
-     * @var string
-     */
-    protected $username = '';
-    /**
-     * @var string
-     */
-    protected $password = '';
-    /**
-     * @var bool
-     */
-    protected $ssl = false;
-    /**
-     * @var int
-     */
-    protected $timeout = 10;
-
-    /**
-     * @var string
-     */
-    protected $database = Driver::COUCHDB_DEFAULT_DB_NAME;
-
-    /**
-     * @return string
-     */
-    public function getDatabase(): string
-    {
-        return $this->database;
-    }
-
-    /**
-     * @param string $database
-     * @return Config
-     */
-    public function setDatabase(string $database): Config
-    {
-        /** @see https://docs.couchdb.org/en/latest/api/database/common.html#put--db */
-        if(\preg_match('#^[a-z][a-z0-9_\-+\$()/]+$#', $database)){
-            $this->database = $database;
-            return $this;
-        }
-
-        throw new PhpfastcacheInvalidArgumentException(sprintf(
-            "Error: illegal_database_name Name: '%s'. Only lowercase characters (a-z), digits (0-9), and any of the characters _, $, (, ), +, -, and / are allowed. Must begin with a letter.",
-            $database
-        ));
-    }
-
-    /**
-     * @return string
-     */
-    public function getHost(): string
-    {
-        return $this->host;
-    }
-
-    /**
-     * @param string $host
-     * @return self
-     */
-    public function setHost(string $host): self
-    {
-        $this->host = $host;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getPort(): int
-    {
-        return $this->port;
-    }
-
-    /**
-     * @param int $port
-     * @return self
-     */
-    public function setPort(int $port): self
-    {
-        $this->port = $port;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUsername(): string
-    {
-        return $this->username;
-    }
-
-    /**
-     * @param string $username
-     * @return self
-     */
-    public function setUsername(string $username): self
-    {
-        $this->username = $username;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPassword(): string
-    {
-        return $this->password;
-    }
-
-    /**
-     * @param string $password
-     * @return self
-     */
-    public function setPassword(string $password): self
-    {
-        $this->password = $password;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isSsl(): bool
-    {
-        return $this->ssl;
-    }
-
-    /**
-     * @param bool $ssl
-     * @return self
-     */
-    public function setSsl(bool $ssl): self
-    {
-        $this->ssl = $ssl;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getTimeout(): int
-    {
-        return $this->timeout;
-    }
-
-    /**
-     * @param int $timeout
-     * @return self
-     */
-    public function setTimeout(int $timeout): self
-    {
-        $this->timeout = $timeout;
-        return $this;
-    }
+	/**
+	 * @var string
+	 */
+	protected $host = '127.0.0.1';
+
+	/**
+	 * @var int
+	 */
+	protected $port = 5984;
+
+	/**
+	 * @var string
+	 */
+	protected $username = '';
+	/**
+	 * @var string
+	 */
+	protected $password = '';
+	/**
+	 * @var bool
+	 */
+	protected $ssl = false;
+	/**
+	 * @var int
+	 */
+	protected $timeout = 10;
+
+	/**
+	 * @var string
+	 */
+	protected $database = Driver::COUCHDB_DEFAULT_DB_NAME;
+
+	/**
+	 * @return string
+	 */
+	public function getDatabase(): string
+	{
+		return $this->database;
+	}
+
+	/**
+	 * @param string $database
+	 * @return Config
+	 */
+	public function setDatabase(string $database): Config
+	{
+		/** @see https://docs.couchdb.org/en/latest/api/database/common.html#put--db */
+		if(\preg_match('#^[a-z][a-z0-9_\-+\$()/]+$#', $database)){
+			$this->database = $database;
+			return $this;
+		}
+
+		throw new PhpfastcacheInvalidArgumentException(sprintf(
+			"Error: illegal_database_name Name: '%s'. Only lowercase characters (a-z), digits (0-9), and any of the characters _, $, (, ), +, -, and / are allowed. Must begin with a letter.",
+			$database
+		));
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getHost(): string
+	{
+		return $this->host;
+	}
+
+	/**
+	 * @param string $host
+	 * @return self
+	 */
+	public function setHost(string $host): self
+	{
+		$this->host = $host;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getPort(): int
+	{
+		return $this->port;
+	}
+
+	/**
+	 * @param int $port
+	 * @return self
+	 */
+	public function setPort(int $port): self
+	{
+		$this->port = $port;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUsername(): string
+	{
+		return $this->username;
+	}
+
+	/**
+	 * @param string $username
+	 * @return self
+	 */
+	public function setUsername(string $username): self
+	{
+		$this->username = $username;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getPassword(): string
+	{
+		return $this->password;
+	}
+
+	/**
+	 * @param string $password
+	 * @return self
+	 */
+	public function setPassword(string $password): self
+	{
+		$this->password = $password;
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isSsl(): bool
+	{
+		return $this->ssl;
+	}
+
+	/**
+	 * @param bool $ssl
+	 * @return self
+	 */
+	public function setSsl(bool $ssl): self
+	{
+		$this->ssl = $ssl;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getTimeout(): int
+	{
+		return $this->timeout;
+	}
+
+	/**
+	 * @param int $timeout
+	 * @return self
+	 */
+	public function setTimeout(int $timeout): self
+	{
+		$this->timeout = $timeout;
+		return $this;
+	}
 }

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Drivers/Couchdb/Driver.php

Spacing +4 added lines, -4 removed lines

@@ -122,9 +122,9 @@ 
      */
     protected function createDatabase()
     {
-        try{
+        try {
             $this->instance->getDatabaseInfo($this->getDatabaseName());
-        } catch(HTTPException $e){
+        } catch (HTTPException $e) {
             $this->instance->createDatabase($this->getDatabaseName());
         }
     }
@@ -279,14 +279,14 @@ 
             new \DateTimeZone($value[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX]['timezone'])
         );
 
-        if(isset($value[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX])){
+        if (isset($value[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX])) {
             $value[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX] = new \DateTime(
                 $value[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX]['date'],
                 new \DateTimeZone($value[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX]['timezone'])
             );
         }
 
-        if(isset($value[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX])){
+        if (isset($value[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX])) {
             $value[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX] = new \DateTime(
                 $value[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX]['date'],
                 new \DateTimeZone($value[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX]['timezone'])

Indentation +252 added lines, -252 removed lines

@@ -33,266 +33,266 @@
  */
 class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterface
 {
-    public const COUCHDB_DEFAULT_DB_NAME = 'phpfastcache'; // Public because used in config
-
-    use DriverBaseTrait;
-
-    /**
-     * @return bool
-     */
-    public function driverCheck(): bool
-    {
-        return class_exists(CouchDBClient::class);
-    }
-
-    /**
-     * @return string
-     */
-    public function getHelp(): string
-    {
-        return <<<HELP
+	public const COUCHDB_DEFAULT_DB_NAME = 'phpfastcache'; // Public because used in config
+
+	use DriverBaseTrait;
+
+	/**
+	 * @return bool
+	 */
+	public function driverCheck(): bool
+	{
+		return class_exists(CouchDBClient::class);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getHelp(): string
+	{
+		return <<<HELP
 <p>
 To install the Couchdb HTTP client library via Composer:
 <code>composer require "doctrine/couchdb" "@dev"</code>
 </p>
 HELP;
-    }
-
-    /**
-     * @return DriverStatistic
-     */
-    public function getStats(): DriverStatistic
-    {
-        $info = $this->instance->getDatabaseInfo();
-
-        return (new DriverStatistic())
-            ->setSize($info['sizes']['active'] ?? 0)
-            ->setRawData($info)
-            ->setData(implode(', ', array_keys($this->itemInstances)))
-            ->setInfo('Couchdb version ' . $this->instance->getVersion() . "\n For more information see RawData.");
-    }
-
-    /**
-     * @return bool
-     * @throws PhpfastcacheLogicException
-     */
-    protected function driverConnect(): bool
-    {
-        if ($this->instance instanceof CouchDBClient) {
-            throw new PhpfastcacheLogicException('Already connected to Couchdb server');
-        }
-
-        $clientConfig = $this->getConfig();
-
-        $url = ($clientConfig->isSsl() ? 'https://' : 'http://');
-        if ($clientConfig->getUsername()) {
-            $url .= $clientConfig->getUsername();
-            if ($clientConfig->getPassword()) {
-                $url .= ":{$clientConfig->getPassword()}";
-            }
-            $url .= '@';
-        }
-        $url .= $clientConfig->getHost();
-        $url .= ":{$clientConfig->getPort()}";
-        $url .= '/' . \urlencode($this->getDatabaseName());
-
-        $this->instance = CouchDBClient::create(
-            [
-                'dbname' => $this->getDatabaseName(),
-                'url' => $url,
-                'timeout' => $clientConfig->getTimeout(),
-            ]
-        );
-
-        $this->createDatabase();
-
-        return true;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getDatabaseName(): string
-    {
-        return $this->getConfig()->getDatabase() ?: self::COUCHDB_DEFAULT_DB_NAME;
-    }
-
-    /**
-     * @return void
-     */
-    protected function createDatabase()
-    {
-        try{
-            $this->instance->getDatabaseInfo($this->getDatabaseName());
-        } catch(HTTPException $e){
-            $this->instance->createDatabase($this->getDatabaseName());
-        }
-    }
-
-    protected function getCouchDbItemKey(CacheItemInterface $item)
-    {
-        return 'pfc_' . $item->getEncodedKey();
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return null|array
-     * @throws PhpfastcacheDriverException
-     */
-    protected function driverRead(CacheItemInterface $item)
-    {
-        try {
-            $response = $this->instance->findDocument($this->getCouchDbItemKey($item));
-        } catch (CouchDBException $e) {
-            throw new PhpfastcacheDriverException('Got error while trying to get a document: ' . $e->getMessage(), 0, $e);
-        }
-
-        if ($response->status === 404 || empty($response->body[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX])) {
-            return null;
-        }
-
-        if ($response->status === 200) {
-            return $this->decode($response->body);
-        }
-
-        throw new PhpfastcacheDriverException('Got unexpected HTTP status: ' . $response->status);
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return bool
-     * @throws PhpfastcacheDriverException
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    protected function driverWrite(CacheItemInterface $item): bool
-    {
-        /**
-         * Check for Cross-Driver type confusion
-         */
-        if ($item instanceof Item) {
-            try {
-                $this->instance->putDocument(
-                    $this->encodeDocument($this->driverPreWrap($item)),
-                    $this->getCouchDbItemKey($item),
-                    $this->getLatestDocumentRevision($this->getCouchDbItemKey($item))
-                );
-            } catch (CouchDBException $e) {
-                throw new PhpfastcacheDriverException('Got error while trying to upsert a document: ' . $e->getMessage(), 0, $e);
-            }
-            return true;
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /**
-     * @return string|null
-     */
-    protected function getLatestDocumentRevision($docId)
-    {
-        $path = '/' . \urlencode($this->getDatabaseName()) . '/' . urlencode($docId);
-
-        $response = $this->instance->getHttpClient()->request(
-            'HEAD',
-            $path,
-            null,
-            false
-        );
-        if (!empty($response->headers['etag'])) {
-            return trim($response->headers['etag'], " '\"\t\n\r\0\x0B");
-        }
-
-        return null;
-    }
-
-    /********************
+	}
+
+	/**
+	 * @return DriverStatistic
+	 */
+	public function getStats(): DriverStatistic
+	{
+		$info = $this->instance->getDatabaseInfo();
+
+		return (new DriverStatistic())
+			->setSize($info['sizes']['active'] ?? 0)
+			->setRawData($info)
+			->setData(implode(', ', array_keys($this->itemInstances)))
+			->setInfo('Couchdb version ' . $this->instance->getVersion() . "\n For more information see RawData.");
+	}
+
+	/**
+	 * @return bool
+	 * @throws PhpfastcacheLogicException
+	 */
+	protected function driverConnect(): bool
+	{
+		if ($this->instance instanceof CouchDBClient) {
+			throw new PhpfastcacheLogicException('Already connected to Couchdb server');
+		}
+
+		$clientConfig = $this->getConfig();
+
+		$url = ($clientConfig->isSsl() ? 'https://' : 'http://');
+		if ($clientConfig->getUsername()) {
+			$url .= $clientConfig->getUsername();
+			if ($clientConfig->getPassword()) {
+				$url .= ":{$clientConfig->getPassword()}";
+			}
+			$url .= '@';
+		}
+		$url .= $clientConfig->getHost();
+		$url .= ":{$clientConfig->getPort()}";
+		$url .= '/' . \urlencode($this->getDatabaseName());
+
+		$this->instance = CouchDBClient::create(
+			[
+				'dbname' => $this->getDatabaseName(),
+				'url' => $url,
+				'timeout' => $clientConfig->getTimeout(),
+			]
+		);
+
+		$this->createDatabase();
+
+		return true;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getDatabaseName(): string
+	{
+		return $this->getConfig()->getDatabase() ?: self::COUCHDB_DEFAULT_DB_NAME;
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function createDatabase()
+	{
+		try{
+			$this->instance->getDatabaseInfo($this->getDatabaseName());
+		} catch(HTTPException $e){
+			$this->instance->createDatabase($this->getDatabaseName());
+		}
+	}
+
+	protected function getCouchDbItemKey(CacheItemInterface $item)
+	{
+		return 'pfc_' . $item->getEncodedKey();
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return null|array
+	 * @throws PhpfastcacheDriverException
+	 */
+	protected function driverRead(CacheItemInterface $item)
+	{
+		try {
+			$response = $this->instance->findDocument($this->getCouchDbItemKey($item));
+		} catch (CouchDBException $e) {
+			throw new PhpfastcacheDriverException('Got error while trying to get a document: ' . $e->getMessage(), 0, $e);
+		}
+
+		if ($response->status === 404 || empty($response->body[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX])) {
+			return null;
+		}
+
+		if ($response->status === 200) {
+			return $this->decode($response->body);
+		}
+
+		throw new PhpfastcacheDriverException('Got unexpected HTTP status: ' . $response->status);
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return bool
+	 * @throws PhpfastcacheDriverException
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	protected function driverWrite(CacheItemInterface $item): bool
+	{
+		/**
+		 * Check for Cross-Driver type confusion
+		 */
+		if ($item instanceof Item) {
+			try {
+				$this->instance->putDocument(
+					$this->encodeDocument($this->driverPreWrap($item)),
+					$this->getCouchDbItemKey($item),
+					$this->getLatestDocumentRevision($this->getCouchDbItemKey($item))
+				);
+			} catch (CouchDBException $e) {
+				throw new PhpfastcacheDriverException('Got error while trying to upsert a document: ' . $e->getMessage(), 0, $e);
+			}
+			return true;
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/**
+	 * @return string|null
+	 */
+	protected function getLatestDocumentRevision($docId)
+	{
+		$path = '/' . \urlencode($this->getDatabaseName()) . '/' . urlencode($docId);
+
+		$response = $this->instance->getHttpClient()->request(
+			'HEAD',
+			$path,
+			null,
+			false
+		);
+		if (!empty($response->headers['etag'])) {
+			return trim($response->headers['etag'], " '\"\t\n\r\0\x0B");
+		}
+
+		return null;
+	}
+
+	/********************
      *
      * PSR-6 Extended Methods
      *
      *******************/
 
-    /**
-     * @param CacheItemInterface $item
-     * @return bool
-     * @throws PhpfastcacheDriverException
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    protected function driverDelete(CacheItemInterface $item): bool
-    {
-        /**
-         * Check for Cross-Driver type confusion
-         */
-        if ($item instanceof Item) {
-            try {
-                $this->instance->deleteDocument($this->getCouchDbItemKey($item), $this->getLatestDocumentRevision($this->getCouchDbItemKey($item)));
-            } catch (CouchDBException $e) {
-                throw new PhpfastcacheDriverException('Got error while trying to delete a document: ' . $e->getMessage(), 0, $e);
-            }
-            return true;
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /**
-     * @return bool
-     * @throws PhpfastcacheDriverException
-     */
-    protected function driverClear(): bool
-    {
-        try {
-            $this->instance->deleteDatabase($this->getDatabaseName());
-            $this->createDatabase();
-        } catch (CouchDBException $e) {
-            throw new PhpfastcacheDriverException('Got error while trying to delete and recreate the database: ' . $e->getMessage(), 0, $e);
-        }
-
-        return true;
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    protected function encodeDocument(array $data): array
-    {
-        $data[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX] = $this->encode($data[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX]);
-
-        return $data;
-    }
-
-    /**
-     * Specific document decoder for Couchdb
-     * since we dont store encoded version
-     * for performance purposes
-     *
-     * @param $value
-     * @return mixed
-     * @throws \Exception
-     */
-    protected function decode($value)
-    {
-        $value[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX] = \unserialize($value[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX], ['allowed_classes' => true]);
-
-        $value[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX] = new \DateTime(
-            $value[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX]['date'],
-            new \DateTimeZone($value[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX]['timezone'])
-        );
-
-        if(isset($value[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX])){
-            $value[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX] = new \DateTime(
-                $value[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX]['date'],
-                new \DateTimeZone($value[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX]['timezone'])
-            );
-        }
-
-        if(isset($value[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX])){
-            $value[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX] = new \DateTime(
-                $value[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX]['date'],
-                new \DateTimeZone($value[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX]['timezone'])
-            );
-        }
-
-        return $value;
-    }
+	/**
+	 * @param CacheItemInterface $item
+	 * @return bool
+	 * @throws PhpfastcacheDriverException
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	protected function driverDelete(CacheItemInterface $item): bool
+	{
+		/**
+		 * Check for Cross-Driver type confusion
+		 */
+		if ($item instanceof Item) {
+			try {
+				$this->instance->deleteDocument($this->getCouchDbItemKey($item), $this->getLatestDocumentRevision($this->getCouchDbItemKey($item)));
+			} catch (CouchDBException $e) {
+				throw new PhpfastcacheDriverException('Got error while trying to delete a document: ' . $e->getMessage(), 0, $e);
+			}
+			return true;
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/**
+	 * @return bool
+	 * @throws PhpfastcacheDriverException
+	 */
+	protected function driverClear(): bool
+	{
+		try {
+			$this->instance->deleteDatabase($this->getDatabaseName());
+			$this->createDatabase();
+		} catch (CouchDBException $e) {
+			throw new PhpfastcacheDriverException('Got error while trying to delete and recreate the database: ' . $e->getMessage(), 0, $e);
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param array $data
+	 * @return array
+	 */
+	protected function encodeDocument(array $data): array
+	{
+		$data[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX] = $this->encode($data[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX]);
+
+		return $data;
+	}
+
+	/**
+	 * Specific document decoder for Couchdb
+	 * since we dont store encoded version
+	 * for performance purposes
+	 *
+	 * @param $value
+	 * @return mixed
+	 * @throws \Exception
+	 */
+	protected function decode($value)
+	{
+		$value[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX] = \unserialize($value[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX], ['allowed_classes' => true]);
+
+		$value[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX] = new \DateTime(
+			$value[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX]['date'],
+			new \DateTimeZone($value[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX]['timezone'])
+		);
+
+		if(isset($value[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX])){
+			$value[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX] = new \DateTime(
+				$value[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX]['date'],
+				new \DateTimeZone($value[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX]['timezone'])
+			);
+		}
+
+		if(isset($value[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX])){
+			$value[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX] = new \DateTime(
+				$value[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX]['date'],
+				new \DateTimeZone($value[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX]['timezone'])
+			);
+		}
+
+		return $value;
+	}
 }

Braces +15 added lines, -15 removed lines

@@ -120,17 +120,16 @@ 
     /**
      * @return void
      */
-    protected function createDatabase()
-    {
+    protected function createDatabase() {
         try{
             $this->instance->getDatabaseInfo($this->getDatabaseName());
-        } catch(HTTPException $e){
+        }
+        catch(HTTPException $e){
             $this->instance->createDatabase($this->getDatabaseName());
         }
     }
 
-    protected function getCouchDbItemKey(CacheItemInterface $item)
-    {
+    protected function getCouchDbItemKey(CacheItemInterface $item) {
         return 'pfc_' . $item->getEncodedKey();
     }
 
@@ -139,11 +138,11 @@ 
      * @return null|array
      * @throws PhpfastcacheDriverException
      */
-    protected function driverRead(CacheItemInterface $item)
-    {
+    protected function driverRead(CacheItemInterface $item) {
         try {
             $response = $this->instance->findDocument($this->getCouchDbItemKey($item));
-        } catch (CouchDBException $e) {
+        }
+        catch (CouchDBException $e) {
             throw new PhpfastcacheDriverException('Got error while trying to get a document: ' . $e->getMessage(), 0, $e);
         }
 
@@ -176,7 +175,8 @@ 
                     $this->getCouchDbItemKey($item),
                     $this->getLatestDocumentRevision($this->getCouchDbItemKey($item))
                 );
-            } catch (CouchDBException $e) {
+            }
+            catch (CouchDBException $e) {
                 throw new PhpfastcacheDriverException('Got error while trying to upsert a document: ' . $e->getMessage(), 0, $e);
             }
             return true;
@@ -188,8 +188,7 @@ 
     /**
      * @return string|null
      */
-    protected function getLatestDocumentRevision($docId)
-    {
+    protected function getLatestDocumentRevision($docId) {
         $path = '/' . \urlencode($this->getDatabaseName()) . '/' . urlencode($docId);
 
         $response = $this->instance->getHttpClient()->request(
@@ -225,7 +224,8 @@ 
         if ($item instanceof Item) {
             try {
                 $this->instance->deleteDocument($this->getCouchDbItemKey($item), $this->getLatestDocumentRevision($this->getCouchDbItemKey($item)));
-            } catch (CouchDBException $e) {
+            }
+            catch (CouchDBException $e) {
                 throw new PhpfastcacheDriverException('Got error while trying to delete a document: ' . $e->getMessage(), 0, $e);
             }
             return true;
@@ -243,7 +243,8 @@ 
         try {
             $this->instance->deleteDatabase($this->getDatabaseName());
             $this->createDatabase();
-        } catch (CouchDBException $e) {
+        }
+        catch (CouchDBException $e) {
             throw new PhpfastcacheDriverException('Got error while trying to delete and recreate the database: ' . $e->getMessage(), 0, $e);
         }
 
@@ -270,8 +271,7 @@ 
      * @return mixed
      * @throws \Exception
      */
-    protected function decode($value)
-    {
+    protected function decode($value) {
         $value[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX] = \unserialize($value[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX], ['allowed_classes' => true]);
 
         $value[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX] = new \DateTime(

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Drivers/Files/Driver.php

Spacing +2 added lines, -2 removed lines

@@ -76,9 +76,9 @@
     {
         $file_path = $this->getFilePath($item->getKey(), true);
 
-        try{
+        try {
             $content = $this->readFile($file_path);
-        }catch (PhpfastcacheIOException $e){
+        } catch (PhpfastcacheIOException $e) {
             return null;
         }
 

Indentation +110 added lines, -110 removed lines

@@ -37,114 +37,114 @@
  */
 class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterface
 {
-    use IOHelperTrait;
-    use DriverBaseTrait {
-        DriverBaseTrait::__construct as private __parentConstruct;
-    }
-
-    /**
-     * Driver constructor.
-     * @param Config $config
-     * @param string $instanceId
-     */
-    public function __construct(Config $config, string $instanceId)
-    {
-        $this->__parentConstruct($config, $instanceId);
-    }
-
-    /**
-     * @return bool
-     */
-    public function driverCheck(): bool
-    {
-        return is_writable($this->getPath()) || mkdir($concurrentDirectory = $this->getPath(), $this->getDefaultChmod(), true) || is_dir($concurrentDirectory);
-    }
-
-    /**
-     * @return bool
-     */
-    protected function driverConnect(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return null|array
-     */
-    protected function driverRead(CacheItemInterface $item)
-    {
-        $file_path = $this->getFilePath($item->getKey(), true);
-
-        try{
-            $content = $this->readFile($file_path);
-        }catch (PhpfastcacheIOException $e){
-            return null;
-        }
-
-        return $this->decode($content);
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    protected function driverWrite(CacheItemInterface $item): bool
-    {
-        /**
-         * Check for Cross-Driver type confusion
-         */
-        if ($item instanceof Item) {
-            $file_path = $this->getFilePath($item->getKey());
-            $data = $this->encode($this->driverPreWrap($item));
-
-            /**
-             * Force write
-             */
-            try {
-                return $this->writefile($file_path, $data, $this->getConfig()->isSecureFileManipulation());
-            } catch (Exception $e) {
-                return false;
-            }
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    protected function driverDelete(CacheItemInterface $item): bool
-    {
-        /**
-         * Check for Cross-Driver type confusion
-         */
-        if ($item instanceof Item) {
-            $file_path = $this->getFilePath($item->getKey(), true);
-            if (\file_exists($file_path) && @\unlink($file_path)) {
-                \clearstatcache(true, $file_path);
-                $dir = \dirname($file_path);
-                if (!(new FilesystemIterator($dir))->valid()) {
-                    \rmdir($dir);
-                }
-                return true;
-            }
-
-            return false;
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /**
-     * @return bool
-     * @throws \Phpfastcache\Exceptions\PhpfastcacheIOException
-     */
-    protected function driverClear(): bool
-    {
-        return Directory::rrmdir($this->getPath(true));
-    }
+	use IOHelperTrait;
+	use DriverBaseTrait {
+		DriverBaseTrait::__construct as private __parentConstruct;
+	}
+
+	/**
+	 * Driver constructor.
+	 * @param Config $config
+	 * @param string $instanceId
+	 */
+	public function __construct(Config $config, string $instanceId)
+	{
+		$this->__parentConstruct($config, $instanceId);
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function driverCheck(): bool
+	{
+		return is_writable($this->getPath()) || mkdir($concurrentDirectory = $this->getPath(), $this->getDefaultChmod(), true) || is_dir($concurrentDirectory);
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function driverConnect(): bool
+	{
+		return true;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return null|array
+	 */
+	protected function driverRead(CacheItemInterface $item)
+	{
+		$file_path = $this->getFilePath($item->getKey(), true);
+
+		try{
+			$content = $this->readFile($file_path);
+		}catch (PhpfastcacheIOException $e){
+			return null;
+		}
+
+		return $this->decode($content);
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	protected function driverWrite(CacheItemInterface $item): bool
+	{
+		/**
+		 * Check for Cross-Driver type confusion
+		 */
+		if ($item instanceof Item) {
+			$file_path = $this->getFilePath($item->getKey());
+			$data = $this->encode($this->driverPreWrap($item));
+
+			/**
+			 * Force write
+			 */
+			try {
+				return $this->writefile($file_path, $data, $this->getConfig()->isSecureFileManipulation());
+			} catch (Exception $e) {
+				return false;
+			}
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	protected function driverDelete(CacheItemInterface $item): bool
+	{
+		/**
+		 * Check for Cross-Driver type confusion
+		 */
+		if ($item instanceof Item) {
+			$file_path = $this->getFilePath($item->getKey(), true);
+			if (\file_exists($file_path) && @\unlink($file_path)) {
+				\clearstatcache(true, $file_path);
+				$dir = \dirname($file_path);
+				if (!(new FilesystemIterator($dir))->valid()) {
+					\rmdir($dir);
+				}
+				return true;
+			}
+
+			return false;
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/**
+	 * @return bool
+	 * @throws \Phpfastcache\Exceptions\PhpfastcacheIOException
+	 */
+	protected function driverClear(): bool
+	{
+		return Directory::rrmdir($this->getPath(true));
+	}
 }

Braces +6 added lines, -6 removed lines

@@ -47,8 +47,7 @@ 
      * @param Config $config
      * @param string $instanceId
      */
-    public function __construct(Config $config, string $instanceId)
-    {
+    public function __construct(Config $config, string $instanceId) {
         $this->__parentConstruct($config, $instanceId);
     }
 
@@ -72,13 +71,13 @@ 
      * @param CacheItemInterface $item
      * @return null|array
      */
-    protected function driverRead(CacheItemInterface $item)
-    {
+    protected function driverRead(CacheItemInterface $item) {
         $file_path = $this->getFilePath($item->getKey(), true);
 
         try{
             $content = $this->readFile($file_path);
-        }catch (PhpfastcacheIOException $e){
+        }
+        catch (PhpfastcacheIOException $e){
             return null;
         }
 
@@ -104,7 +103,8 @@ 
              */
             try {
                 return $this->writefile($file_path, $data, $this->getConfig()->isSecureFileManipulation());
-            } catch (Exception $e) {
+            }
+            catch (Exception $e) {
                 return false;
             }
         }

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Drivers/Ssdb/Driver.php

Spacing +3 added lines, -3 removed lines

@@ -117,7 +117,7 @@ 
          * Check for Cross-Driver type confusion
          */
         if ($item instanceof Item) {
-            return (bool)$this->instance->setx($item->getEncodedKey(), $this->encode($this->driverPreWrap($item)), $item->getTtl());
+            return (bool) $this->instance->setx($item->getEncodedKey(), $this->encode($this->driverPreWrap($item)), $item->getTtl());
         }
 
         throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
@@ -134,7 +134,7 @@ 
          * Check for Cross-Driver type confusion
          */
         if ($item instanceof Item) {
-            return (bool)$this->instance->del($item->getEncodedKey());
+            return (bool) $this->instance->del($item->getEncodedKey());
         }
 
         throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
@@ -151,6 +151,6 @@ 
      */
     protected function driverClear(): bool
     {
-        return (bool)$this->instance->flushdb('kv');
+        return (bool) $this->instance->flushdb('kv');
     }
 }

Indentation +115 added lines, -115 removed lines

@@ -33,124 +33,124 @@
  */
 class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterface
 {
-    use DriverBaseTrait;
-
-    /**
-     * @return bool
-     */
-    public function driverCheck(): bool
-    {
-        static $driverCheck;
-        if ($driverCheck === null) {
-            return ($driverCheck = class_exists('phpssdb\Core\SSDB'));
-        }
-
-        return $driverCheck;
-    }
-
-    /**
-     * @return DriverStatistic
-     */
-    public function getStats(): DriverStatistic
-    {
-        $stat = new DriverStatistic();
-        $info = $this->instance->info();
-
-        /**
-         * Data returned by Ssdb are very poorly formatted
-         * using hardcoded offset of pair key-value :-(
-         */
-        $stat->setInfo(sprintf("Ssdb-server v%s with a total of %s call(s).\n For more information see RawData.", $info[2], $info[6]))
-            ->setRawData($info)
-            ->setData(implode(', ', array_keys($this->itemInstances)))
-            ->setSize($this->instance->dbsize());
-
-        return $stat;
-    }
-
-    /**
-     * @return bool
-     * @throws PhpfastcacheDriverException
-     */
-    protected function driverConnect(): bool
-    {
-        try {
-            $clientConfig = $this->getConfig();
-
-            $this->instance = new SimpleSSDB($clientConfig->getHost(), $clientConfig->getPort(), $clientConfig->getTimeout());
-            if (!empty($clientConfig->getPassword())) {
-                $this->instance->auth($clientConfig->getPassword());
-            }
-
-            if (!$this->instance) {
-                return false;
-            }
-
-            return true;
-        } catch (SSDBException $e) {
-            throw new PhpfastcacheDriverCheckException('Ssdb failed to connect with error: ' . $e->getMessage(), 0, $e);
-        }
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return null|array
-     */
-    protected function driverRead(CacheItemInterface $item)
-    {
-        $val = $this->instance->get($item->getEncodedKey());
-        if ($val == false) {
-            return null;
-        }
-
-        return $this->decode($val);
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return mixed
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    protected function driverWrite(CacheItemInterface $item): bool
-    {
-        /**
-         * Check for Cross-Driver type confusion
-         */
-        if ($item instanceof Item) {
-            return (bool)$this->instance->setx($item->getEncodedKey(), $this->encode($this->driverPreWrap($item)), $item->getTtl());
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    protected function driverDelete(CacheItemInterface $item): bool
-    {
-        /**
-         * Check for Cross-Driver type confusion
-         */
-        if ($item instanceof Item) {
-            return (bool)$this->instance->del($item->getEncodedKey());
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /********************
+	use DriverBaseTrait;
+
+	/**
+	 * @return bool
+	 */
+	public function driverCheck(): bool
+	{
+		static $driverCheck;
+		if ($driverCheck === null) {
+			return ($driverCheck = class_exists('phpssdb\Core\SSDB'));
+		}
+
+		return $driverCheck;
+	}
+
+	/**
+	 * @return DriverStatistic
+	 */
+	public function getStats(): DriverStatistic
+	{
+		$stat = new DriverStatistic();
+		$info = $this->instance->info();
+
+		/**
+		 * Data returned by Ssdb are very poorly formatted
+		 * using hardcoded offset of pair key-value :-(
+		 */
+		$stat->setInfo(sprintf("Ssdb-server v%s with a total of %s call(s).\n For more information see RawData.", $info[2], $info[6]))
+			->setRawData($info)
+			->setData(implode(', ', array_keys($this->itemInstances)))
+			->setSize($this->instance->dbsize());
+
+		return $stat;
+	}
+
+	/**
+	 * @return bool
+	 * @throws PhpfastcacheDriverException
+	 */
+	protected function driverConnect(): bool
+	{
+		try {
+			$clientConfig = $this->getConfig();
+
+			$this->instance = new SimpleSSDB($clientConfig->getHost(), $clientConfig->getPort(), $clientConfig->getTimeout());
+			if (!empty($clientConfig->getPassword())) {
+				$this->instance->auth($clientConfig->getPassword());
+			}
+
+			if (!$this->instance) {
+				return false;
+			}
+
+			return true;
+		} catch (SSDBException $e) {
+			throw new PhpfastcacheDriverCheckException('Ssdb failed to connect with error: ' . $e->getMessage(), 0, $e);
+		}
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return null|array
+	 */
+	protected function driverRead(CacheItemInterface $item)
+	{
+		$val = $this->instance->get($item->getEncodedKey());
+		if ($val == false) {
+			return null;
+		}
+
+		return $this->decode($val);
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return mixed
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	protected function driverWrite(CacheItemInterface $item): bool
+	{
+		/**
+		 * Check for Cross-Driver type confusion
+		 */
+		if ($item instanceof Item) {
+			return (bool)$this->instance->setx($item->getEncodedKey(), $this->encode($this->driverPreWrap($item)), $item->getTtl());
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	protected function driverDelete(CacheItemInterface $item): bool
+	{
+		/**
+		 * Check for Cross-Driver type confusion
+		 */
+		if ($item instanceof Item) {
+			return (bool)$this->instance->del($item->getEncodedKey());
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/********************
      *
      * PSR-6 Extended Methods
      *
      *******************/
 
-    /**
-     * @return bool
-     */
-    protected function driverClear(): bool
-    {
-        return (bool)$this->instance->flushdb('kv');
-    }
+	/**
+	 * @return bool
+	 */
+	protected function driverClear(): bool
+	{
+		return (bool)$this->instance->flushdb('kv');
+	}
 }

Braces +3 added lines, -3 removed lines

@@ -87,7 +87,8 @@ 
             }
 
             return true;
-        } catch (SSDBException $e) {
+        }
+        catch (SSDBException $e) {
             throw new PhpfastcacheDriverCheckException('Ssdb failed to connect with error: ' . $e->getMessage(), 0, $e);
         }
     }
@@ -96,8 +97,7 @@ 
      * @param CacheItemInterface $item
      * @return null|array
      */
-    protected function driverRead(CacheItemInterface $item)
-    {
+    protected function driverRead(CacheItemInterface $item) {
         $val = $this->instance->get($item->getEncodedKey());
         if ($val == false) {
             return null;

plugins/files/php/lib/phpfastcache/lib/Phpfastcache/Drivers/Zenddisk/Driver.php

Spacing +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
          * Check for Cross-Driver type confusion
          */
         if ($item instanceof Item) {
-            return (bool)zend_disk_cache_delete($item->getKey());
+            return (bool) zend_disk_cache_delete($item->getKey());
         }
 
         throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');

Indentation +98 added lines, -98 removed lines

@@ -31,111 +31,111 @@
  */
 class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterface
 {
-    use DriverBaseTrait;
-
-    /**
-     * @return bool
-     */
-    public function driverCheck(): bool
-    {
-        return extension_loaded('Zend Data Cache') && function_exists('zend_disk_cache_store');
-    }
-
-    /**
-     * @return string
-     */
-    public function getHelp(): string
-    {
-        return <<<HELP
+	use DriverBaseTrait;
+
+	/**
+	 * @return bool
+	 */
+	public function driverCheck(): bool
+	{
+		return extension_loaded('Zend Data Cache') && function_exists('zend_disk_cache_store');
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getHelp(): string
+	{
+		return <<<HELP
 <p>
 This driver rely on Zend Server 8.5+, see: https://www.zend.com/en/products/zend_server
 </p>
 HELP;
-    }
-
-    /**
-     * @return DriverStatistic
-     */
-    public function getStats(): DriverStatistic
-    {
-        $stat = new DriverStatistic();
-        $stat->setInfo('[ZendDisk] A void info string')
-            ->setSize(0)
-            ->setData(implode(', ', array_keys($this->itemInstances)))
-            ->setRawData(false);
-
-        return $stat;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function driverConnect(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return null|array
-     */
-    protected function driverRead(CacheItemInterface $item)
-    {
-        $data = zend_disk_cache_fetch($item->getKey());
-        if ($data === false) {
-            return null;
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return mixed
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    protected function driverWrite(CacheItemInterface $item): bool
-    {
-        /**
-         * Check for Cross-Driver type confusion
-         */
-        if ($item instanceof Item) {
-            $ttl = $item->getExpirationDate()->getTimestamp() - time();
-
-            return zend_disk_cache_store($item->getKey(), $this->driverPreWrap($item), ($ttl > 0 ? $ttl : 0));
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /********************
+	}
+
+	/**
+	 * @return DriverStatistic
+	 */
+	public function getStats(): DriverStatistic
+	{
+		$stat = new DriverStatistic();
+		$stat->setInfo('[ZendDisk] A void info string')
+			->setSize(0)
+			->setData(implode(', ', array_keys($this->itemInstances)))
+			->setRawData(false);
+
+		return $stat;
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function driverConnect(): bool
+	{
+		return true;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return null|array
+	 */
+	protected function driverRead(CacheItemInterface $item)
+	{
+		$data = zend_disk_cache_fetch($item->getKey());
+		if ($data === false) {
+			return null;
+		}
+
+		return $data;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return mixed
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	protected function driverWrite(CacheItemInterface $item): bool
+	{
+		/**
+		 * Check for Cross-Driver type confusion
+		 */
+		if ($item instanceof Item) {
+			$ttl = $item->getExpirationDate()->getTimestamp() - time();
+
+			return zend_disk_cache_store($item->getKey(), $this->driverPreWrap($item), ($ttl > 0 ? $ttl : 0));
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/********************
      *
      * PSR-6 Extended Methods
      *
      *******************/
 
-    /**
-     * @param CacheItemInterface $item
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    protected function driverDelete(CacheItemInterface $item): bool
-    {
-        /**
-         * Check for Cross-Driver type confusion
-         */
-        if ($item instanceof Item) {
-            return (bool)zend_disk_cache_delete($item->getKey());
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /**
-     * @return bool
-     */
-    protected function driverClear(): bool
-    {
-        return @zend_disk_cache_clear();
-    }
+	/**
+	 * @param CacheItemInterface $item
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	protected function driverDelete(CacheItemInterface $item): bool
+	{
+		/**
+		 * Check for Cross-Driver type confusion
+		 */
+		if ($item instanceof Item) {
+			return (bool)zend_disk_cache_delete($item->getKey());
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function driverClear(): bool
+	{
+		return @zend_disk_cache_clear();
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
      * @param CacheItemInterface $item
      * @return null|array
      */
-    protected function driverRead(CacheItemInterface $item)
-    {
+    protected function driverRead(CacheItemInterface $item) {
         $data = zend_disk_cache_fetch($item->getKey());
         if ($data === false) {
             return null;