grommunio / grommunio-web

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

Spacing +4 added lines, -4 removed lines

@@ -164,7 +164,7 @@ 
          */
         if ($item instanceof Item) {
             try {
-                return (bool)$this->getBucket()->upsert(
+                return (bool) $this->getBucket()->upsert(
                     $item->getEncodedKey(),
                     $this->encodeDocument($this->driverPreWrap($item)),
                     ['expiry' => $item->getTtl()]
@@ -189,7 +189,7 @@ 
          */
         if ($item instanceof Item) {
             try {
-                return (bool)$this->getBucket()->remove($item->getEncodedKey());
+                return (bool) $this->getBucket()->remove($item->getEncodedKey());
             } catch (Exception $e) {
                 return $e->getCode() === COUCHBASE_KEY_ENOENT;
             }
@@ -207,7 +207,7 @@ 
         $data[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX] = $this->encode($data[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX]);
         $data[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX] = $data[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX]->format(\DateTime::ATOM);
 
-        if($this->getConfig()->isItemDetailedDate()){
+        if ($this->getConfig()->isItemDetailedDate()) {
             $data[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX] = $data[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX]->format(\DateTime::ATOM);
             $data[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX] = $data[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX]->format(\DateTime::ATOM);
         }
@@ -227,7 +227,7 @@ 
             $data[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX]
         );
 
-        if($this->getConfig()->isItemDetailedDate()){
+        if ($this->getConfig()->isItemDetailedDate()) {
             $data[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX] = \DateTime::createFromFormat(
                 \DateTime::ATOM,
                 $data[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX]

Indentation +212 added lines, -212 removed lines

@@ -38,221 +38,221 @@
  */
 class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterface
 {
-    use DriverBaseTrait {
-        __construct as __baseConstruct;
-    }
-
-    /**
-     * @var CouchbaseBucket[]
-     */
-    protected $bucketInstances = [];
-
-    /**
-     * @var CouchbaseBucket
-     */
-    protected $bucketInstance;
-
-    /**
-     * @var string
-     */
-    protected $currentBucket = '';
-
-    public function __construct(ConfigurationOption $config, $instanceId)
-    {
-        // @todo Deprecation to enable in v8.1
-        // \trigger_error('Couchbase driver is now deprecated and will be removed in the V9, use Couchbasev3 instead which will support SDK 3.', \E_USER_DEPRECATED);
-        $this->__baseConstruct($config, $instanceId);
-    }
-
-    /**
-     * @return bool
-     */
-    public function driverCheck(): bool
-    {
-        return extension_loaded('couchbase');
-    }
-
-    /**
-     * @return DriverStatistic
-     */
-    public function getStats(): DriverStatistic
-    {
-        $info = $this->getBucket()->manager()->info();
-
-        return (new DriverStatistic())
-            ->setSize($info['basicStats']['diskUsed'])
-            ->setRawData($info)
-            ->setData(implode(', ', array_keys($this->itemInstances)))
-            ->setInfo(
-                'CouchBase version ' . $info['nodes'][0]['version'] . ', Uptime (in days): ' . round(
-                    $info['nodes'][0]['uptime'] / 86400,
-                    1
-                ) . "\n For more information see RawData."
-            );
-    }
-
-    /**
-     * @return bool
-     * @throws PhpfastcacheLogicException
-     */
-    protected function driverConnect(): bool
-    {
-        if (\class_exists(\Couchbase\ClusterOptions::class)) {
-            throw new PhpfastcacheDriverCheckException('You are using the Couchbase PHP SDK 3.x so please use driver Couchbasev3');
-        }
-
-        if ($this->instance instanceof CouchbaseClient) {
-            throw new PhpfastcacheLogicException('Already connected to Couchbase server');
-        }
-
-        $clientConfig = $this->getConfig();
-
-        $authenticator = new PasswordAuthenticator();
-        $authenticator->username($clientConfig->getUsername())->password($clientConfig->getPassword());
-
-        $this->instance = new CouchbaseClient(
-            'couchbase://' . $clientConfig->getHost() . ($clientConfig->getPort() ? ":{$clientConfig->getPort()}" : '')
-        );
-
-        $this->instance->authenticate($authenticator);
-        $this->setBucket($this->instance->openBucket($clientConfig->getBucketName()));
-
-        return true;
-    }
-
-    /**
-     * @param CouchbaseBucket $CouchbaseBucket
-     */
-    protected function setBucket(CouchbaseBucket $CouchbaseBucket)
-    {
-        $this->bucketInstance = $CouchbaseBucket;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return null|array
-     */
-    protected function driverRead(CacheItemInterface $item)
-    {
-        try {
-            /**
-             * CouchbaseBucket::get() returns a CouchbaseMetaDoc object
-             */
-            return $this->decodeDocument((array) $this->getBucket()->get($item->getEncodedKey())->value);
-        } catch (CouchbaseException $e) {
-            return null;
-        }
-    }
-
-    /**
-     * @return CouchbaseBucket
-     */
-    protected function getBucket(): CouchbaseBucket
-    {
-        return $this->bucketInstance;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    protected function driverWrite(CacheItemInterface $item): bool
-    {
-        /**
-         * Check for Cross-Driver type confusion
-         */
-        if ($item instanceof Item) {
-            try {
-                return (bool)$this->getBucket()->upsert(
-                    $item->getEncodedKey(),
-                    $this->encodeDocument($this->driverPreWrap($item)),
-                    ['expiry' => $item->getTtl()]
-                );
-            } catch (CouchbaseException $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) {
-            try {
-                return (bool)$this->getBucket()->remove($item->getEncodedKey());
-            } catch (Exception $e) {
-                return $e->getCode() === COUCHBASE_KEY_ENOENT;
-            }
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /**
-     * @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]);
-        $data[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX] = $data[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX]->format(\DateTime::ATOM);
-
-        if($this->getConfig()->isItemDetailedDate()){
-            $data[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX] = $data[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX]->format(\DateTime::ATOM);
-            $data[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX] = $data[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX]->format(\DateTime::ATOM);
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    protected function decodeDocument(array $data): array
-    {
-        $data[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX] = $this->decode($data[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX]);
-        $data[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX] = \DateTime::createFromFormat(
-            \DateTime::ATOM,
-            $data[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX]
-        );
-
-        if($this->getConfig()->isItemDetailedDate()){
-            $data[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX] = \DateTime::createFromFormat(
-                \DateTime::ATOM,
-                $data[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX]
-            );
-
-            $data[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX] = \DateTime::createFromFormat(
-                \DateTime::ATOM,
-                $data[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX]
-            );
-        }
-
-        return $data;
-    }
-    /********************
+	use DriverBaseTrait {
+		__construct as __baseConstruct;
+	}
+
+	/**
+	 * @var CouchbaseBucket[]
+	 */
+	protected $bucketInstances = [];
+
+	/**
+	 * @var CouchbaseBucket
+	 */
+	protected $bucketInstance;
+
+	/**
+	 * @var string
+	 */
+	protected $currentBucket = '';
+
+	public function __construct(ConfigurationOption $config, $instanceId)
+	{
+		// @todo Deprecation to enable in v8.1
+		// \trigger_error('Couchbase driver is now deprecated and will be removed in the V9, use Couchbasev3 instead which will support SDK 3.', \E_USER_DEPRECATED);
+		$this->__baseConstruct($config, $instanceId);
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function driverCheck(): bool
+	{
+		return extension_loaded('couchbase');
+	}
+
+	/**
+	 * @return DriverStatistic
+	 */
+	public function getStats(): DriverStatistic
+	{
+		$info = $this->getBucket()->manager()->info();
+
+		return (new DriverStatistic())
+			->setSize($info['basicStats']['diskUsed'])
+			->setRawData($info)
+			->setData(implode(', ', array_keys($this->itemInstances)))
+			->setInfo(
+				'CouchBase version ' . $info['nodes'][0]['version'] . ', Uptime (in days): ' . round(
+					$info['nodes'][0]['uptime'] / 86400,
+					1
+				) . "\n For more information see RawData."
+			);
+	}
+
+	/**
+	 * @return bool
+	 * @throws PhpfastcacheLogicException
+	 */
+	protected function driverConnect(): bool
+	{
+		if (\class_exists(\Couchbase\ClusterOptions::class)) {
+			throw new PhpfastcacheDriverCheckException('You are using the Couchbase PHP SDK 3.x so please use driver Couchbasev3');
+		}
+
+		if ($this->instance instanceof CouchbaseClient) {
+			throw new PhpfastcacheLogicException('Already connected to Couchbase server');
+		}
+
+		$clientConfig = $this->getConfig();
+
+		$authenticator = new PasswordAuthenticator();
+		$authenticator->username($clientConfig->getUsername())->password($clientConfig->getPassword());
+
+		$this->instance = new CouchbaseClient(
+			'couchbase://' . $clientConfig->getHost() . ($clientConfig->getPort() ? ":{$clientConfig->getPort()}" : '')
+		);
+
+		$this->instance->authenticate($authenticator);
+		$this->setBucket($this->instance->openBucket($clientConfig->getBucketName()));
+
+		return true;
+	}
+
+	/**
+	 * @param CouchbaseBucket $CouchbaseBucket
+	 */
+	protected function setBucket(CouchbaseBucket $CouchbaseBucket)
+	{
+		$this->bucketInstance = $CouchbaseBucket;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return null|array
+	 */
+	protected function driverRead(CacheItemInterface $item)
+	{
+		try {
+			/**
+			 * CouchbaseBucket::get() returns a CouchbaseMetaDoc object
+			 */
+			return $this->decodeDocument((array) $this->getBucket()->get($item->getEncodedKey())->value);
+		} catch (CouchbaseException $e) {
+			return null;
+		}
+	}
+
+	/**
+	 * @return CouchbaseBucket
+	 */
+	protected function getBucket(): CouchbaseBucket
+	{
+		return $this->bucketInstance;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	protected function driverWrite(CacheItemInterface $item): bool
+	{
+		/**
+		 * Check for Cross-Driver type confusion
+		 */
+		if ($item instanceof Item) {
+			try {
+				return (bool)$this->getBucket()->upsert(
+					$item->getEncodedKey(),
+					$this->encodeDocument($this->driverPreWrap($item)),
+					['expiry' => $item->getTtl()]
+				);
+			} catch (CouchbaseException $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) {
+			try {
+				return (bool)$this->getBucket()->remove($item->getEncodedKey());
+			} catch (Exception $e) {
+				return $e->getCode() === COUCHBASE_KEY_ENOENT;
+			}
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/**
+	 * @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]);
+		$data[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX] = $data[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX]->format(\DateTime::ATOM);
+
+		if($this->getConfig()->isItemDetailedDate()){
+			$data[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX] = $data[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX]->format(\DateTime::ATOM);
+			$data[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX] = $data[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX]->format(\DateTime::ATOM);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * @param array $data
+	 * @return array
+	 */
+	protected function decodeDocument(array $data): array
+	{
+		$data[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX] = $this->decode($data[ExtendedCacheItemPoolInterface::DRIVER_DATA_WRAPPER_INDEX]);
+		$data[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX] = \DateTime::createFromFormat(
+			\DateTime::ATOM,
+			$data[ExtendedCacheItemPoolInterface::DRIVER_EDATE_WRAPPER_INDEX]
+		);
+
+		if($this->getConfig()->isItemDetailedDate()){
+			$data[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX] = \DateTime::createFromFormat(
+				\DateTime::ATOM,
+				$data[ExtendedCacheItemPoolInterface::DRIVER_CDATE_WRAPPER_INDEX]
+			);
+
+			$data[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX] = \DateTime::createFromFormat(
+				\DateTime::ATOM,
+				$data[ExtendedCacheItemPoolInterface::DRIVER_MDATE_WRAPPER_INDEX]
+			);
+		}
+
+		return $data;
+	}
+	/********************
      *
      * PSR-6 Extended Methods
      *
      *******************/
 
-    /**
-     * @return bool
-     */
-    protected function driverClear(): bool
-    {
-        $this->getBucket()->manager()->flush();
-        return true;
-    }
+	/**
+	 * @return bool
+	 */
+	protected function driverClear(): bool
+	{
+		$this->getBucket()->manager()->flush();
+		return true;
+	}
 }

Braces +9 added lines, -9 removed lines

@@ -57,8 +57,7 @@ 
      */
     protected $currentBucket = '';
 
-    public function __construct(ConfigurationOption $config, $instanceId)
-    {
+    public function __construct(ConfigurationOption $config, $instanceId) {
         // @todo Deprecation to enable in v8.1
         // \trigger_error('Couchbase driver is now deprecated and will be removed in the V9, use Couchbasev3 instead which will support SDK 3.', \E_USER_DEPRECATED);
         $this->__baseConstruct($config, $instanceId);
@@ -123,8 +122,7 @@ 
     /**
      * @param CouchbaseBucket $CouchbaseBucket
      */
-    protected function setBucket(CouchbaseBucket $CouchbaseBucket)
-    {
+    protected function setBucket(CouchbaseBucket $CouchbaseBucket) {
         $this->bucketInstance = $CouchbaseBucket;
     }
 
@@ -132,14 +130,14 @@ 
      * @param CacheItemInterface $item
      * @return null|array
      */
-    protected function driverRead(CacheItemInterface $item)
-    {
+    protected function driverRead(CacheItemInterface $item) {
         try {
             /**
              * CouchbaseBucket::get() returns a CouchbaseMetaDoc object
              */
             return $this->decodeDocument((array) $this->getBucket()->get($item->getEncodedKey())->value);
-        } catch (CouchbaseException $e) {
+        }
+        catch (CouchbaseException $e) {
             return null;
         }
     }
@@ -169,7 +167,8 @@ 
                     $this->encodeDocument($this->driverPreWrap($item)),
                     ['expiry' => $item->getTtl()]
                 );
-            } catch (CouchbaseException $e) {
+            }
+            catch (CouchbaseException $e) {
                 return false;
             }
         }
@@ -190,7 +189,8 @@ 
         if ($item instanceof Item) {
             try {
                 return (bool)$this->getBucket()->remove($item->getEncodedKey());
-            } catch (Exception $e) {
+            }
+            catch (Exception $e) {
                 return $e->getCode() === COUCHBASE_KEY_ENOENT;
             }
         }

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

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
          * Check for Cross-Driver type confusion
          */
         if ($item instanceof Item) {
-            return (bool)$this->instance->set($item->getKey(), $this->encode($this->driverPreWrap($item)));
+            return (bool) $this->instance->set($item->getKey(), $this->encode($this->driverPreWrap($item)));
         }
 
         throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
@@ -113,7 +113,7 @@ 
             $this->instance->close();
             $this->instance = null;
         }
-        $result = (bool)LeveldbClient::destroy($this->getLeveldbFile());
+        $result = (bool) LeveldbClient::destroy($this->getLeveldbFile());
         $this->driverConnect();
 
         return $result;

Indentation +110 added lines, -110 removed lines

@@ -32,114 +32,114 @@
  */
 class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterface
 {
-    use DriverBaseTrait;
-    use IOHelperTrait;
-
-    protected const LEVELDB_FILENAME = '.database';
-
-    /**
-     * @return bool
-     */
-    public function driverCheck(): bool
-    {
-        return extension_loaded('Leveldb');
-    }
-
-    /**
-     * Close connection on destruct
-     */
-    public function __destruct()
-    {
-        if ($this->instance instanceof LeveldbClient) {
-            $this->instance->close();
-            $this->instance = null;
-        }
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return null|array
-     */
-    protected function driverRead(CacheItemInterface $item)
-    {
-        $val = $this->instance->get($item->getKey());
-        if (!$val) {
-            return null;
-        }
-
-        return $this->decode($val);
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    protected function driverWrite(CacheItemInterface $item): bool
-    {
-        /**
-         * Check for Cross-Driver type confusion
-         */
-        if ($item instanceof Item) {
-            return (bool)$this->instance->set($item->getKey(), $this->encode($this->driverPreWrap($item)));
-        }
-
-        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 $this->instance->delete($item->getKey());
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /**
-     * @return bool
-     */
-    protected function driverClear(): bool
-    {
-        if ($this->instance instanceof LeveldbClient) {
-            $this->instance->close();
-            $this->instance = null;
-        }
-        $result = (bool)LeveldbClient::destroy($this->getLeveldbFile());
-        $this->driverConnect();
-
-        return $result;
-    }
-
-    /**
-     * @return string
-     * @throws PhpfastcacheCoreException
-     */
-    public function getLeveldbFile(): string
-    {
-        return $this->getPath() . '/' . self::LEVELDB_FILENAME;
-    }
-
-    /**
-     * @return bool
-     * @throws PhpfastcacheLogicException
-     */
-    protected function driverConnect(): bool
-    {
-        if ($this->instance instanceof LeveldbClient) {
-            throw new PhpfastcacheLogicException('Already connected to Leveldb database');
-        }
-
-        $this->instance = $this->instance ?: new LeveldbClient($this->getLeveldbFile());
-
-        return true;
-    }
+	use DriverBaseTrait;
+	use IOHelperTrait;
+
+	protected const LEVELDB_FILENAME = '.database';
+
+	/**
+	 * @return bool
+	 */
+	public function driverCheck(): bool
+	{
+		return extension_loaded('Leveldb');
+	}
+
+	/**
+	 * Close connection on destruct
+	 */
+	public function __destruct()
+	{
+		if ($this->instance instanceof LeveldbClient) {
+			$this->instance->close();
+			$this->instance = null;
+		}
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return null|array
+	 */
+	protected function driverRead(CacheItemInterface $item)
+	{
+		$val = $this->instance->get($item->getKey());
+		if (!$val) {
+			return null;
+		}
+
+		return $this->decode($val);
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	protected function driverWrite(CacheItemInterface $item): bool
+	{
+		/**
+		 * Check for Cross-Driver type confusion
+		 */
+		if ($item instanceof Item) {
+			return (bool)$this->instance->set($item->getKey(), $this->encode($this->driverPreWrap($item)));
+		}
+
+		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 $this->instance->delete($item->getKey());
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function driverClear(): bool
+	{
+		if ($this->instance instanceof LeveldbClient) {
+			$this->instance->close();
+			$this->instance = null;
+		}
+		$result = (bool)LeveldbClient::destroy($this->getLeveldbFile());
+		$this->driverConnect();
+
+		return $result;
+	}
+
+	/**
+	 * @return string
+	 * @throws PhpfastcacheCoreException
+	 */
+	public function getLeveldbFile(): string
+	{
+		return $this->getPath() . '/' . self::LEVELDB_FILENAME;
+	}
+
+	/**
+	 * @return bool
+	 * @throws PhpfastcacheLogicException
+	 */
+	protected function driverConnect(): bool
+	{
+		if ($this->instance instanceof LeveldbClient) {
+			throw new PhpfastcacheLogicException('Already connected to Leveldb database');
+		}
+
+		$this->instance = $this->instance ?: new LeveldbClient($this->getLeveldbFile());
+
+		return true;
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -48,8 +48,7 @@ 
     /**
      * Close connection on destruct
      */
-    public function __destruct()
-    {
+    public function __destruct() {
         if ($this->instance instanceof LeveldbClient) {
             $this->instance->close();
             $this->instance = null;
@@ -60,8 +59,7 @@ 
      * @param CacheItemInterface $item
      * @return null|array
      */
-    protected function driverRead(CacheItemInterface $item)
-    {
+    protected function driverRead(CacheItemInterface $item) {
         $val = $this->instance->get($item->getKey());
         if (!$val) {
             return null;

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

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
                 throw new PhpfastcacheInvalidConfigurationException('Path must be a valid string in "$server" configuration array if host is not defined');
             }
 
-            if (!empty($server['host']) && (empty($server['port']) || !is_int($server['port'])|| $server['port'] < 1)) {
+            if (!empty($server['host']) && (empty($server['port']) || !is_int($server['port']) || $server['port'] < 1)) {
                 throw new PhpfastcacheInvalidConfigurationException('Port must be a valid integer in "$server" configuration array');
             }
 

Indentation +181 added lines, -181 removed lines

@@ -22,185 +22,185 @@
 
 class Config extends ConfigurationOption
 {
-    /**
-     * @var array
-     *
-     * Multiple server can be added this way:
-     *       $cfg->setServers([
-     *         [
-     *           // If you use an UNIX socket set the host and port to null
-     *           'host' => '127.0.0.1',
-     *           //'path' => 'path/to/unix/socket',
-     *           'port' => 11211,
-     *           'saslUser' => null,
-     *           'saslPassword' => null,
-     *         ]
-     *      ]);
-     */
-    protected $servers = [];
-
-    /**
-     * @var string
-     */
-    protected $host = '127.0.0.1';
-
-    /**
-     * @var int
-     */
-    protected $port = 11211;
-
-    /**
-     * @var string
-     */
-    protected $saslUser = '';
-
-    /**
-     * @var string
-     */
-    protected $saslPassword = '';
-
-    /**
-     * @var string
-     */
-    protected $optPrefix = '';
-
-    /**
-     * @return string
-     */
-    public function getSaslUser(): string
-    {
-        return $this->saslUser;
-    }
-
-    /**
-     * @param string $saslUser
-     * @return self
-     */
-    public function setSaslUser(string $saslUser): self
-    {
-        $this->saslUser = $saslUser;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSaslPassword(): string
-    {
-        return $this->saslPassword;
-    }
-
-    /**
-     * @param string $saslPassword
-     * @return self
-     */
-    public function setSaslPassword(string $saslPassword): self
-    {
-        $this->saslPassword = $saslPassword;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getServers(): array
-    {
-        return $this->servers;
-    }
-
-    /**
-     * @param array $servers
-     * @return self
-     * @throws PhpfastcacheInvalidConfigurationException
-     */
-    public function setServers(array $servers): self
-    {
-        foreach ($servers as $server) {
-            if ($diff = array_diff(array_keys($server), ['host', 'port', 'saslUser', 'saslPassword', 'path'])) {
-                throw new PhpfastcacheInvalidConfigurationException('Unknown keys for memcached server: ' . implode(', ', $diff));
-            }
-
-            if (!empty($server['host']) && !empty($server['path'])) {
-                throw new PhpfastcacheInvalidConfigurationException('Host and path cannot be simultaneous defined.');
-            }
-
-            if ((isset($server['host']) && !is_string($server['host'])) || (empty($server['path']) && empty($server['host']))) {
-                throw new PhpfastcacheInvalidConfigurationException('Host must be a valid string in "$server" configuration array if path is not defined');
-            }
-
-            if ((isset($server['path']) && !is_string($server['path'])) || (empty($server['host']) && empty($server['path']))) {
-                throw new PhpfastcacheInvalidConfigurationException('Path must be a valid string in "$server" configuration array if host is not defined');
-            }
-
-            if (!empty($server['host']) && (empty($server['port']) || !is_int($server['port'])|| $server['port'] < 1)) {
-                throw new PhpfastcacheInvalidConfigurationException('Port must be a valid integer in "$server" configuration array');
-            }
-
-            if (!empty($server['port']) && !empty($server['path'])) {
-                throw new PhpfastcacheInvalidConfigurationException('Port should not be defined along with path');
-            }
-
-            if (!empty($server['saslUser']) && !empty($server['saslPassword']) && (!is_string($server['saslUser']) || !is_string($server['saslPassword']))) {
-                throw new PhpfastcacheInvalidConfigurationException('If provided, saslUser and saslPassword must be a string');
-            }
-        }
-        $this->servers = $servers;
-        return $this;
-    }
-
-    /**
-     * @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 Config
-     */
-    public function setPort(int $port): self
-    {
-        $this->port = $port;
-        return $this;
-    }
-
-    /**
-     * @return string
-     * @since 8.0.2
-     */
-    public function getOptPrefix(): string
-    {
-        return $this->optPrefix;
-    }
-
-    /**
-     * @param string $optPrefix
-     * @return Config
-     * @since 8.0.2
-     */
-    public function setOptPrefix(string $optPrefix): Config
-    {
-        $this->optPrefix = trim($optPrefix);
-        return $this;
-    }
+	/**
+	 * @var array
+	 *
+	 * Multiple server can be added this way:
+	 *       $cfg->setServers([
+	 *         [
+	 *           // If you use an UNIX socket set the host and port to null
+	 *           'host' => '127.0.0.1',
+	 *           //'path' => 'path/to/unix/socket',
+	 *           'port' => 11211,
+	 *           'saslUser' => null,
+	 *           'saslPassword' => null,
+	 *         ]
+	 *      ]);
+	 */
+	protected $servers = [];
+
+	/**
+	 * @var string
+	 */
+	protected $host = '127.0.0.1';
+
+	/**
+	 * @var int
+	 */
+	protected $port = 11211;
+
+	/**
+	 * @var string
+	 */
+	protected $saslUser = '';
+
+	/**
+	 * @var string
+	 */
+	protected $saslPassword = '';
+
+	/**
+	 * @var string
+	 */
+	protected $optPrefix = '';
+
+	/**
+	 * @return string
+	 */
+	public function getSaslUser(): string
+	{
+		return $this->saslUser;
+	}
+
+	/**
+	 * @param string $saslUser
+	 * @return self
+	 */
+	public function setSaslUser(string $saslUser): self
+	{
+		$this->saslUser = $saslUser;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getSaslPassword(): string
+	{
+		return $this->saslPassword;
+	}
+
+	/**
+	 * @param string $saslPassword
+	 * @return self
+	 */
+	public function setSaslPassword(string $saslPassword): self
+	{
+		$this->saslPassword = $saslPassword;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getServers(): array
+	{
+		return $this->servers;
+	}
+
+	/**
+	 * @param array $servers
+	 * @return self
+	 * @throws PhpfastcacheInvalidConfigurationException
+	 */
+	public function setServers(array $servers): self
+	{
+		foreach ($servers as $server) {
+			if ($diff = array_diff(array_keys($server), ['host', 'port', 'saslUser', 'saslPassword', 'path'])) {
+				throw new PhpfastcacheInvalidConfigurationException('Unknown keys for memcached server: ' . implode(', ', $diff));
+			}
+
+			if (!empty($server['host']) && !empty($server['path'])) {
+				throw new PhpfastcacheInvalidConfigurationException('Host and path cannot be simultaneous defined.');
+			}
+
+			if ((isset($server['host']) && !is_string($server['host'])) || (empty($server['path']) && empty($server['host']))) {
+				throw new PhpfastcacheInvalidConfigurationException('Host must be a valid string in "$server" configuration array if path is not defined');
+			}
+
+			if ((isset($server['path']) && !is_string($server['path'])) || (empty($server['host']) && empty($server['path']))) {
+				throw new PhpfastcacheInvalidConfigurationException('Path must be a valid string in "$server" configuration array if host is not defined');
+			}
+
+			if (!empty($server['host']) && (empty($server['port']) || !is_int($server['port'])|| $server['port'] < 1)) {
+				throw new PhpfastcacheInvalidConfigurationException('Port must be a valid integer in "$server" configuration array');
+			}
+
+			if (!empty($server['port']) && !empty($server['path'])) {
+				throw new PhpfastcacheInvalidConfigurationException('Port should not be defined along with path');
+			}
+
+			if (!empty($server['saslUser']) && !empty($server['saslPassword']) && (!is_string($server['saslUser']) || !is_string($server['saslPassword']))) {
+				throw new PhpfastcacheInvalidConfigurationException('If provided, saslUser and saslPassword must be a string');
+			}
+		}
+		$this->servers = $servers;
+		return $this;
+	}
+
+	/**
+	 * @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 Config
+	 */
+	public function setPort(int $port): self
+	{
+		$this->port = $port;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.0.2
+	 */
+	public function getOptPrefix(): string
+	{
+		return $this->optPrefix;
+	}
+
+	/**
+	 * @param string $optPrefix
+	 * @return Config
+	 * @since 8.0.2
+	 */
+	public function setOptPrefix(string $optPrefix): Config
+	{
+		$this->optPrefix = trim($optPrefix);
+		return $this;
+	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
             ->setData(implode(', ', array_keys($this->itemInstances)))
             ->setInfo(sprintf("The memcache daemon v%s is up since %s.\n For more information see RawData.", $stats['version'], $date->format(DATE_RFC2822)))
             ->setRawData($stats)
-            ->setSize((int)$stats['bytes']);
+            ->setSize((int) $stats['bytes']);
     }
 
     /**

Indentation +170 added lines, -170 removed lines

@@ -37,179 +37,179 @@
  */
 class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterface
 {
-    use DriverBaseTrait {
-        __construct as protected __parentConstruct;
-    }
-    use MemcacheDriverCollisionDetectorTrait;
-
-    /**
-     * Driver constructor.
-     * @param ConfigurationOption $config
-     * @param string $instanceId
-     * @throws PhpfastcacheDriverException
-     */
-    public function __construct(ConfigurationOption $config, string $instanceId)
-    {
-        self::checkCollision('Memcached');
-        $this->__parentConstruct($config, $instanceId);
-    }
-
-    /**
-     * @return bool
-     */
-    public function driverCheck(): bool
-    {
-        return class_exists('Memcached');
-    }
-
-    /**
-     * @return DriverStatistic
-     */
-    public function getStats(): DriverStatistic
-    {
-        $stats = current($this->instance->getStats());
-        $stats['uptime'] = $stats['uptime'] ?? 0;
-        $stats['bytes'] = $stats['bytes'] ?? 0;
-        $stats['version'] = $stats['version'] ?? $this->instance->getVersion();
-
-        $date = (new DateTime())->setTimestamp(time() - $stats['uptime']);
-
-        return (new DriverStatistic())
-            ->setData(implode(', ', array_keys($this->itemInstances)))
-            ->setInfo(sprintf("The memcache daemon v%s is up since %s.\n For more information see RawData.", $stats['version'], $date->format(DATE_RFC2822)))
-            ->setRawData($stats)
-            ->setSize((int)$stats['bytes']);
-    }
-
-    /**
-     * @return bool
-     */
-    protected function driverConnect(): bool
-    {
-        $this->instance = new MemcachedSoftware();
-        $optPrefix = $this->getConfig()->getOptPrefix();
-        $this->instance->setOption(MemcachedSoftware::OPT_BINARY_PROTOCOL, true);
-
-        if ($optPrefix) {
-            $this->instance->setOption(MemcachedSoftware::OPT_PREFIX_KEY, $optPrefix);
-        }
-
-        $servers = $this->getConfig()->getServers();
-
-        if (count($this->getConfig()->getServers()) < 1) {
-            $this->getConfig()->setServers(
-                [
-                    [
-                        'host' => $this->getConfig()->getHost(),
-                        'path' => $this->getConfig()->getPath(),
-                        'port' => $this->getConfig()->getPort(),
-                        'saslUser' => $this->getConfig()->getSaslUser() ?: null,
-                        'saslPassword' => $this->getConfig()->getSaslPassword() ?: null,
-                    ],
-                ]
-            );
-        }
-
-        foreach ($this->getConfig()->getServers() as $server) {
-            try {
-                /**
-                 * If path is provided we consider it as an UNIX Socket
-                 */
-                if (!empty($server['path']) && !$this->instance->addServer($server['path'], 0)) {
-                    $this->fallback = true;
-                } else {
-                    if (!empty($server['host']) && !$this->instance->addServer($server['host'], $server['port'])) {
-                        $this->fallback = true;
-                    }
-                }
-
-                if (!empty($server['saslUser']) && !empty($server['saslPassword'])) {
-                    $this->instance->setSaslAuthData($server['saslUser'], $server['saslPassword']);
-                }
-            } catch (Exception $e) {
-                $this->fallback = true;
-            }
-        }
-
-        /**
-         * Since Memcached does not throw
-         * any error if not connected ...
-         */
-        $version = $this->instance->getVersion();
-        if (!$version || $this->instance->getResultCode() !== MemcachedSoftware::RES_SUCCESS) {
-            throw new PhpfastcacheDriverException('Memcached seems to not be connected');
-        }
-        return true;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return null|array
-     */
-    protected function driverRead(CacheItemInterface $item)
-    {
-        $val = $this->instance->get($item->getKey());
-
-        if ($val === false) {
-            return null;
-        }
-
-        return $val;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    protected function driverWrite(CacheItemInterface $item): bool
-    {
-        /**
-         * Check for Cross-Driver type confusion
-         */
-        if ($item instanceof Item) {
-            $ttl = $item->getExpirationDate()->getTimestamp() - time();
-
-            // Memcache will only allow a expiration timer less than 2592000 seconds,
-            // otherwise, it will assume you're giving it a UNIX timestamp.
-            if ($ttl > 2592000) {
-                $ttl = time() + $ttl;
-            }
-
-            return $this->instance->set($item->getKey(), $this->driverPreWrap($item), $ttl);
-        }
-
-        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 $this->instance->delete($item->getKey());
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /********************
+	use DriverBaseTrait {
+		__construct as protected __parentConstruct;
+	}
+	use MemcacheDriverCollisionDetectorTrait;
+
+	/**
+	 * Driver constructor.
+	 * @param ConfigurationOption $config
+	 * @param string $instanceId
+	 * @throws PhpfastcacheDriverException
+	 */
+	public function __construct(ConfigurationOption $config, string $instanceId)
+	{
+		self::checkCollision('Memcached');
+		$this->__parentConstruct($config, $instanceId);
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function driverCheck(): bool
+	{
+		return class_exists('Memcached');
+	}
+
+	/**
+	 * @return DriverStatistic
+	 */
+	public function getStats(): DriverStatistic
+	{
+		$stats = current($this->instance->getStats());
+		$stats['uptime'] = $stats['uptime'] ?? 0;
+		$stats['bytes'] = $stats['bytes'] ?? 0;
+		$stats['version'] = $stats['version'] ?? $this->instance->getVersion();
+
+		$date = (new DateTime())->setTimestamp(time() - $stats['uptime']);
+
+		return (new DriverStatistic())
+			->setData(implode(', ', array_keys($this->itemInstances)))
+			->setInfo(sprintf("The memcache daemon v%s is up since %s.\n For more information see RawData.", $stats['version'], $date->format(DATE_RFC2822)))
+			->setRawData($stats)
+			->setSize((int)$stats['bytes']);
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function driverConnect(): bool
+	{
+		$this->instance = new MemcachedSoftware();
+		$optPrefix = $this->getConfig()->getOptPrefix();
+		$this->instance->setOption(MemcachedSoftware::OPT_BINARY_PROTOCOL, true);
+
+		if ($optPrefix) {
+			$this->instance->setOption(MemcachedSoftware::OPT_PREFIX_KEY, $optPrefix);
+		}
+
+		$servers = $this->getConfig()->getServers();
+
+		if (count($this->getConfig()->getServers()) < 1) {
+			$this->getConfig()->setServers(
+				[
+					[
+						'host' => $this->getConfig()->getHost(),
+						'path' => $this->getConfig()->getPath(),
+						'port' => $this->getConfig()->getPort(),
+						'saslUser' => $this->getConfig()->getSaslUser() ?: null,
+						'saslPassword' => $this->getConfig()->getSaslPassword() ?: null,
+					],
+				]
+			);
+		}
+
+		foreach ($this->getConfig()->getServers() as $server) {
+			try {
+				/**
+				 * If path is provided we consider it as an UNIX Socket
+				 */
+				if (!empty($server['path']) && !$this->instance->addServer($server['path'], 0)) {
+					$this->fallback = true;
+				} else {
+					if (!empty($server['host']) && !$this->instance->addServer($server['host'], $server['port'])) {
+						$this->fallback = true;
+					}
+				}
+
+				if (!empty($server['saslUser']) && !empty($server['saslPassword'])) {
+					$this->instance->setSaslAuthData($server['saslUser'], $server['saslPassword']);
+				}
+			} catch (Exception $e) {
+				$this->fallback = true;
+			}
+		}
+
+		/**
+		 * Since Memcached does not throw
+		 * any error if not connected ...
+		 */
+		$version = $this->instance->getVersion();
+		if (!$version || $this->instance->getResultCode() !== MemcachedSoftware::RES_SUCCESS) {
+			throw new PhpfastcacheDriverException('Memcached seems to not be connected');
+		}
+		return true;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return null|array
+	 */
+	protected function driverRead(CacheItemInterface $item)
+	{
+		$val = $this->instance->get($item->getKey());
+
+		if ($val === false) {
+			return null;
+		}
+
+		return $val;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	protected function driverWrite(CacheItemInterface $item): bool
+	{
+		/**
+		 * Check for Cross-Driver type confusion
+		 */
+		if ($item instanceof Item) {
+			$ttl = $item->getExpirationDate()->getTimestamp() - time();
+
+			// Memcache will only allow a expiration timer less than 2592000 seconds,
+			// otherwise, it will assume you're giving it a UNIX timestamp.
+			if ($ttl > 2592000) {
+				$ttl = time() + $ttl;
+			}
+
+			return $this->instance->set($item->getKey(), $this->driverPreWrap($item), $ttl);
+		}
+
+		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 $this->instance->delete($item->getKey());
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/********************
      *
      * PSR-6 Extended Methods
      *
      *******************/
 
-    /**
-     * @return bool
-     */
-    protected function driverClear(): bool
-    {
-        return $this->instance->flush();
-    }
+	/**
+	 * @return bool
+	 */
+	protected function driverClear(): bool
+	{
+		return $this->instance->flush();
+	}
 }

Braces +6 added lines, -6 removed lines

@@ -48,8 +48,7 @@ 
      * @param string $instanceId
      * @throws PhpfastcacheDriverException
      */
-    public function __construct(ConfigurationOption $config, string $instanceId)
-    {
+    public function __construct(ConfigurationOption $config, string $instanceId) {
         self::checkCollision('Memcached');
         $this->__parentConstruct($config, $instanceId);
     }
@@ -117,7 +116,8 @@ 
                  */
                 if (!empty($server['path']) && !$this->instance->addServer($server['path'], 0)) {
                     $this->fallback = true;
-                } else {
+                }
+                else {
                     if (!empty($server['host']) && !$this->instance->addServer($server['host'], $server['port'])) {
                         $this->fallback = true;
                     }
@@ -126,7 +126,8 @@ 
                 if (!empty($server['saslUser']) && !empty($server['saslPassword'])) {
                     $this->instance->setSaslAuthData($server['saslUser'], $server['saslPassword']);
                 }
-            } catch (Exception $e) {
+            }
+            catch (Exception $e) {
                 $this->fallback = true;
             }
         }
@@ -146,8 +147,7 @@ 
      * @param CacheItemInterface $item
      * @return null|array
      */
-    protected function driverRead(CacheItemInterface $item)
-    {
+    protected function driverRead(CacheItemInterface $item) {
         $val = $this->instance->get($item->getKey());
 
         if ($val === false) {

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

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
         return (new DriverStatistic())
             ->setData(implode(', ', array_keys($this->itemInstances)))
             ->setRawData($info)
-            ->setSize((int)$info['used_memory'])
+            ->setSize((int) $info['used_memory'])
             ->setInfo(
                 sprintf(
                     "The Redis daemon v%s is up since %s.\n For more information see RawData. \n Driver size includes the memory allocation size.",
@@ -169,7 +169,7 @@ 
          * Check for Cross-Driver type confusion
          */
         if ($item instanceof Item) {
-            return (bool)$this->instance->del($item->getKey());
+            return (bool) $this->instance->del($item->getKey());
         }
 
         throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');

Indentation +150 added lines, -150 removed lines

@@ -33,159 +33,159 @@
  */
 class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterface
 {
-    use DriverBaseTrait;
-
-    /**
-     * @return bool
-     */
-    public function driverCheck(): bool
-    {
-        return extension_loaded('Redis');
-    }
-
-    /**
-     * @return DriverStatistic
-     */
-    public function getStats(): DriverStatistic
-    {
-        // used_memory
-        $info = $this->instance->info();
-        $date = (new DateTime())->setTimestamp(time() - $info['uptime_in_seconds']);
-
-        return (new DriverStatistic())
-            ->setData(implode(', ', array_keys($this->itemInstances)))
-            ->setRawData($info)
-            ->setSize((int)$info['used_memory'])
-            ->setInfo(
-                sprintf(
-                    "The Redis daemon v%s is up since %s.\n For more information see RawData. \n Driver size includes the memory allocation size.",
-                    $info['redis_version'],
-                    $date->format(DATE_RFC2822)
-                )
-            );
-    }
-
-    /**
-     * @return bool
-     * @throws PhpfastcacheLogicException
-     */
-    protected function driverConnect(): bool
-    {
-        if ($this->instance instanceof RedisClient) {
-            throw new PhpfastcacheLogicException('Already connected to Redis server');
-        }
-
-        /**
-         * In case of an user-provided
-         * Redis client just return here
-         */
-        if ($this->getConfig()->getRedisClient() instanceof RedisClient) {
-            /**
-             * Unlike Predis, we can't test if we're are connected
-             * or not, so let's just assume that we are
-             */
-            $this->instance = $this->getConfig()->getRedisClient();
-            return true;
-        }
-
-        $this->instance = $this->instance ?: new RedisClient();
-
-        /**
-         * If path is provided we consider it as an UNIX Socket
-         */
-        if ($this->getConfig()->getPath()) {
-            $isConnected = $this->instance->connect($this->getConfig()->getPath());
-        } else {
-            $isConnected = $this->instance->connect($this->getConfig()->getHost(), $this->getConfig()->getPort(), $this->getConfig()->getTimeout());
-        }
-
-        if (!$isConnected && $this->getConfig()->getPath()) {
-            return false;
-        }
-
-        if ($this->getConfig()->getOptPrefix()) {
-            $this->instance->setOption(RedisClient::OPT_PREFIX, $this->getConfig()->getOptPrefix());
-        }
-
-        if ($this->getConfig()->getPassword() && !$this->instance->auth($this->getConfig()->getPassword())) {
-            return false;
-        }
-
-        if ($this->getConfig()->getDatabase() !== null) {
-            $this->instance->select($this->getConfig()->getDatabase());
-        }
-        return true;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return null|array
-     */
-    protected function driverRead(CacheItemInterface $item)
-    {
-        $val = $this->instance->get($item->getKey());
-        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) {
-            $ttl = $item->getExpirationDate()->getTimestamp() - time();
-
-            /**
-             * @see https://redis.io/commands/setex
-             * @see https://redis.io/commands/expire
-             */
-            if ($ttl <= 0) {
-                return $this->instance->expire($item->getKey(), 0);
-            }
-
-            return $this->instance->setex($item->getKey(), $ttl, $this->encode($this->driverPreWrap($item)));
-        }
-
-        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->getKey());
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /********************
+	use DriverBaseTrait;
+
+	/**
+	 * @return bool
+	 */
+	public function driverCheck(): bool
+	{
+		return extension_loaded('Redis');
+	}
+
+	/**
+	 * @return DriverStatistic
+	 */
+	public function getStats(): DriverStatistic
+	{
+		// used_memory
+		$info = $this->instance->info();
+		$date = (new DateTime())->setTimestamp(time() - $info['uptime_in_seconds']);
+
+		return (new DriverStatistic())
+			->setData(implode(', ', array_keys($this->itemInstances)))
+			->setRawData($info)
+			->setSize((int)$info['used_memory'])
+			->setInfo(
+				sprintf(
+					"The Redis daemon v%s is up since %s.\n For more information see RawData. \n Driver size includes the memory allocation size.",
+					$info['redis_version'],
+					$date->format(DATE_RFC2822)
+				)
+			);
+	}
+
+	/**
+	 * @return bool
+	 * @throws PhpfastcacheLogicException
+	 */
+	protected function driverConnect(): bool
+	{
+		if ($this->instance instanceof RedisClient) {
+			throw new PhpfastcacheLogicException('Already connected to Redis server');
+		}
+
+		/**
+		 * In case of an user-provided
+		 * Redis client just return here
+		 */
+		if ($this->getConfig()->getRedisClient() instanceof RedisClient) {
+			/**
+			 * Unlike Predis, we can't test if we're are connected
+			 * or not, so let's just assume that we are
+			 */
+			$this->instance = $this->getConfig()->getRedisClient();
+			return true;
+		}
+
+		$this->instance = $this->instance ?: new RedisClient();
+
+		/**
+		 * If path is provided we consider it as an UNIX Socket
+		 */
+		if ($this->getConfig()->getPath()) {
+			$isConnected = $this->instance->connect($this->getConfig()->getPath());
+		} else {
+			$isConnected = $this->instance->connect($this->getConfig()->getHost(), $this->getConfig()->getPort(), $this->getConfig()->getTimeout());
+		}
+
+		if (!$isConnected && $this->getConfig()->getPath()) {
+			return false;
+		}
+
+		if ($this->getConfig()->getOptPrefix()) {
+			$this->instance->setOption(RedisClient::OPT_PREFIX, $this->getConfig()->getOptPrefix());
+		}
+
+		if ($this->getConfig()->getPassword() && !$this->instance->auth($this->getConfig()->getPassword())) {
+			return false;
+		}
+
+		if ($this->getConfig()->getDatabase() !== null) {
+			$this->instance->select($this->getConfig()->getDatabase());
+		}
+		return true;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return null|array
+	 */
+	protected function driverRead(CacheItemInterface $item)
+	{
+		$val = $this->instance->get($item->getKey());
+		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) {
+			$ttl = $item->getExpirationDate()->getTimestamp() - time();
+
+			/**
+			 * @see https://redis.io/commands/setex
+			 * @see https://redis.io/commands/expire
+			 */
+			if ($ttl <= 0) {
+				return $this->instance->expire($item->getKey(), 0);
+			}
+
+			return $this->instance->setex($item->getKey(), $ttl, $this->encode($this->driverPreWrap($item)));
+		}
+
+		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->getKey());
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/********************
      *
      * PSR-6 Extended Methods
      *
      *******************/
 
-    /**
-     * @return bool
-     */
-    protected function driverClear(): bool
-    {
-        return $this->instance->flushDB();
-    }
+	/**
+	 * @return bool
+	 */
+	protected function driverClear(): bool
+	{
+		return $this->instance->flushDB();
+	}
 }

Braces +3 added lines, -3 removed lines

@@ -95,7 +95,8 @@ 
          */
         if ($this->getConfig()->getPath()) {
             $isConnected = $this->instance->connect($this->getConfig()->getPath());
-        } else {
+        }
+        else {
             $isConnected = $this->instance->connect($this->getConfig()->getHost(), $this->getConfig()->getPort(), $this->getConfig()->getTimeout());
         }
 
@@ -121,8 +122,7 @@ 
      * @param CacheItemInterface $item
      * @return null|array
      */
-    protected function driverRead(CacheItemInterface $item)
-    {
+    protected function driverRead(CacheItemInterface $item) {
         $val = $this->instance->get($item->getKey());
         if ($val == false) {
             return null;

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

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
         return (new DriverStatistic())
             ->setData(implode(', ', array_keys($this->itemInstances)))
             ->setRawData($info)
-            ->setSize((int)$size)
+            ->setSize((int) $size)
             ->setInfo(
                 sprintf(
                     "The Redis daemon v%s is up since %s.\n For more information see RawData. \n Driver size includes the memory allocation size.",
@@ -172,7 +172,7 @@ 
              * @see https://redis.io/commands/expire
              */
             if ($ttl <= 0) {
-                return (bool)$this->instance->expire($item->getKey(), 0);
+                return (bool) $this->instance->expire($item->getKey(), 0);
             }
 
             return $this->instance->setex($item->getKey(), $ttl, $this->encode($this->driverPreWrap($item)))->getPayload() === 'OK';
@@ -198,7 +198,7 @@ 
          * Check for Cross-Driver type confusion
          */
         if ($item instanceof Item) {
-            return (bool)$this->instance->del([$item->getKey()]);
+            return (bool) $this->instance->del([$item->getKey()]);
         }
 
         throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');

Indentation +166 added lines, -166 removed lines

@@ -35,180 +35,180 @@
  */
 class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterface
 {
-    use DriverBaseTrait;
-
-    /**
-     * @return bool
-     */
-    public function driverCheck(): bool
-    {
-        if (extension_loaded('Redis')) {
-            trigger_error('The native Redis extension is installed, you should use Redis instead of Predis to increase performances', E_USER_NOTICE);
-        }
-
-        return class_exists('Predis\Client');
-    }
-
-    /**
-     * @return string
-     */
-    public function getHelp(): string
-    {
-        return <<<HELP
+	use DriverBaseTrait;
+
+	/**
+	 * @return bool
+	 */
+	public function driverCheck(): bool
+	{
+		if (extension_loaded('Redis')) {
+			trigger_error('The native Redis extension is installed, you should use Redis instead of Predis to increase performances', E_USER_NOTICE);
+		}
+
+		return class_exists('Predis\Client');
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getHelp(): string
+	{
+		return <<<HELP
 <p>
 To install the Predis library via Composer:
 <code>composer require "predis/predis" "~1.1.0"</code>
 </p>
 HELP;
-    }
-
-    /**
-     * @return DriverStatistic
-     */
-    public function getStats(): DriverStatistic
-    {
-        $info = $this->instance->info();
-        $size = (isset($info['Memory']['used_memory']) ? $info['Memory']['used_memory'] : 0);
-        $version = (isset($info['Server']['redis_version']) ? $info['Server']['redis_version'] : 0);
-        $date = (isset($info['Server']['uptime_in_seconds']) ? (new DateTime())->setTimestamp(time() - $info['Server']['uptime_in_seconds']) : 'unknown date');
-
-        return (new DriverStatistic())
-            ->setData(implode(', ', array_keys($this->itemInstances)))
-            ->setRawData($info)
-            ->setSize((int)$size)
-            ->setInfo(
-                sprintf(
-                    "The Redis daemon v%s is up since %s.\n For more information see RawData. \n Driver size includes the memory allocation size.",
-                    $version,
-                    $date->format(DATE_RFC2822)
-                )
-            );
-    }
-
-    /**
-     * @return bool
-     * @throws PhpfastcacheDriverException
-     * @throws PhpfastcacheLogicException
-     */
-    protected function driverConnect(): bool
-    {
-        if ($this->instance instanceof PredisClient) {
-            throw new PhpfastcacheLogicException('Already connected to Predis server');
-        }
-
-        /**
-         * In case of an user-provided
-         * Predis client just return here
-         */
-        if ($this->getConfig()->getPredisClient() instanceof PredisClient) {
-            $this->instance = $this->getConfig()->getPredisClient();
-            if (!$this->instance->isConnected()) {
-                $this->instance->connect();
-            }
-            return true;
-        }
-
-        $options = [];
-
-        if ($this->getConfig()->getOptPrefix()) {
-            $options['prefix'] = $this->getConfig()->getOptPrefix();
-        }
-
-        if (!empty($this->getConfig()->getPath())) {
-            $this->instance = new PredisClient(
-                [
-                    'scheme' => $this->getConfig()->getScheme(),
-                    'persistent' => $this->getConfig()->isPersistent(),
-                    'timeout' => $this->getConfig()->getTimeout(),
-                    'path' => $this->getConfig()->getPath(),
-                ], $options
-            );
-        } else {
-            $this->instance = new PredisClient($this->getConfig()->getPredisConfigArray(), $options);
-        }
-
-        try {
-            $this->instance->connect();
-        } catch (PredisConnectionException $e) {
-            throw new PhpfastcacheDriverException(
-                'Failed to connect to predis server. Check the Predis documentation: https://github.com/nrk/predis/tree/v1.1#how-to-install-and-use-predis',
-                0,
-                $e
-            );
-        }
-
-        return true;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return null|array
-     */
-    protected function driverRead(CacheItemInterface $item)
-    {
-        $val = $this->instance->get($item->getKey());
-        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) {
-            $ttl = $item->getExpirationDate()->getTimestamp() - time();
-
-            /**
-             * @see https://redis.io/commands/setex
-             * @see https://redis.io/commands/expire
-             */
-            if ($ttl <= 0) {
-                return (bool)$this->instance->expire($item->getKey(), 0);
-            }
-
-            return $this->instance->setex($item->getKey(), $ttl, $this->encode($this->driverPreWrap($item)))->getPayload() === 'OK';
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /********************
+	}
+
+	/**
+	 * @return DriverStatistic
+	 */
+	public function getStats(): DriverStatistic
+	{
+		$info = $this->instance->info();
+		$size = (isset($info['Memory']['used_memory']) ? $info['Memory']['used_memory'] : 0);
+		$version = (isset($info['Server']['redis_version']) ? $info['Server']['redis_version'] : 0);
+		$date = (isset($info['Server']['uptime_in_seconds']) ? (new DateTime())->setTimestamp(time() - $info['Server']['uptime_in_seconds']) : 'unknown date');
+
+		return (new DriverStatistic())
+			->setData(implode(', ', array_keys($this->itemInstances)))
+			->setRawData($info)
+			->setSize((int)$size)
+			->setInfo(
+				sprintf(
+					"The Redis daemon v%s is up since %s.\n For more information see RawData. \n Driver size includes the memory allocation size.",
+					$version,
+					$date->format(DATE_RFC2822)
+				)
+			);
+	}
+
+	/**
+	 * @return bool
+	 * @throws PhpfastcacheDriverException
+	 * @throws PhpfastcacheLogicException
+	 */
+	protected function driverConnect(): bool
+	{
+		if ($this->instance instanceof PredisClient) {
+			throw new PhpfastcacheLogicException('Already connected to Predis server');
+		}
+
+		/**
+		 * In case of an user-provided
+		 * Predis client just return here
+		 */
+		if ($this->getConfig()->getPredisClient() instanceof PredisClient) {
+			$this->instance = $this->getConfig()->getPredisClient();
+			if (!$this->instance->isConnected()) {
+				$this->instance->connect();
+			}
+			return true;
+		}
+
+		$options = [];
+
+		if ($this->getConfig()->getOptPrefix()) {
+			$options['prefix'] = $this->getConfig()->getOptPrefix();
+		}
+
+		if (!empty($this->getConfig()->getPath())) {
+			$this->instance = new PredisClient(
+				[
+					'scheme' => $this->getConfig()->getScheme(),
+					'persistent' => $this->getConfig()->isPersistent(),
+					'timeout' => $this->getConfig()->getTimeout(),
+					'path' => $this->getConfig()->getPath(),
+				], $options
+			);
+		} else {
+			$this->instance = new PredisClient($this->getConfig()->getPredisConfigArray(), $options);
+		}
+
+		try {
+			$this->instance->connect();
+		} catch (PredisConnectionException $e) {
+			throw new PhpfastcacheDriverException(
+				'Failed to connect to predis server. Check the Predis documentation: https://github.com/nrk/predis/tree/v1.1#how-to-install-and-use-predis',
+				0,
+				$e
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return null|array
+	 */
+	protected function driverRead(CacheItemInterface $item)
+	{
+		$val = $this->instance->get($item->getKey());
+		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) {
+			$ttl = $item->getExpirationDate()->getTimestamp() - time();
+
+			/**
+			 * @see https://redis.io/commands/setex
+			 * @see https://redis.io/commands/expire
+			 */
+			if ($ttl <= 0) {
+				return (bool)$this->instance->expire($item->getKey(), 0);
+			}
+
+			return $this->instance->setex($item->getKey(), $ttl, $this->encode($this->driverPreWrap($item)))->getPayload() === 'OK';
+		}
+
+		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)$this->instance->del([$item->getKey()]);
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /**
-     * @return bool
-     */
-    protected function driverClear(): bool
-    {
-        return $this->instance->flushdb()->getPayload() === 'OK';
-    }
+	/**
+	 * @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->getKey()]);
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function driverClear(): bool
+	{
+		return $this->instance->flushdb()->getPayload() === 'OK';
+	}
 }

Braces +5 added lines, -4 removed lines

@@ -123,13 +123,15 @@ 
                     'path' => $this->getConfig()->getPath(),
                 ], $options
             );
-        } else {
+        }
+        else {
             $this->instance = new PredisClient($this->getConfig()->getPredisConfigArray(), $options);
         }
 
         try {
             $this->instance->connect();
-        } catch (PredisConnectionException $e) {
+        }
+        catch (PredisConnectionException $e) {
             throw new PhpfastcacheDriverException(
                 'Failed to connect to predis server. Check the Predis documentation: https://github.com/nrk/predis/tree/v1.1#how-to-install-and-use-predis',
                 0,
@@ -144,8 +146,7 @@ 
      * @param CacheItemInterface $item
      * @return null|array
      */
-    protected function driverRead(CacheItemInterface $item)
-    {
+    protected function driverRead(CacheItemInterface $item) {
         $val = $this->instance->get($item->getKey());
         if ($val == false) {
             return null;

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

Spacing +6 added lines, -6 removed lines

@@ -95,7 +95,7 @@ 
             )
         )->toArray()[0];
 
-        $array_filter_recursive = static function ($array, callable $callback = null) use (&$array_filter_recursive) {
+        $array_filter_recursive = static function($array, callable $callback = null) use (&$array_filter_recursive) {
             $array = $callback($array);
 
             if (\is_object($array) || \is_array($array)) {
@@ -107,12 +107,12 @@ 
             return $array;
         };
 
-        $callback = static function ($item) {
+        $callback = static function($item) {
             /**
              * Remove unserializable properties
              */
             if ($item instanceof UTCDateTime) {
-                return (string)$item;
+                return (string) $item;
             }
             return $item;
         };
@@ -201,7 +201,7 @@ 
                         self::DRIVER_CDATE_WRAPPER_INDEX =>  new UTCDateTime($item->getCreationDate()),
                     ];
                 }
-                $result = (array)$this->getCollection()->updateOne(
+                $result = (array) $this->getCollection()->updateOne(
                     ['_id' => $this->getMongoDbItemKey($item)],
                     [
                         '$set' => $set,
@@ -281,7 +281,7 @@ 
             $this->database->selectCollection($collectionName)
                 ->createIndex(
                     [self::DRIVER_EDATE_WRAPPER_INDEX => 1],
-                    ['expireAfterSeconds' => 0,  'name' => 'auto_expire_index']
+                    ['expireAfterSeconds' => 0, 'name' => 'auto_expire_index']
                 );
         }
 
@@ -311,7 +311,7 @@ 
         if (count($servers) > 0) {
             $host = array_reduce(
                 $servers,
-                static function ($carry, $data) {
+                static function($carry, $data) {
                     $carry .= ($carry === '' ? '' : ',') . $data['host'] . ':' . $data['port'];
                     return $carry;
                 },

Indentation +321 added lines, -321 removed lines

@@ -36,331 +36,331 @@
  */
 class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterface
 {
-    public const MONGODB_DEFAULT_DB_NAME = 'phpfastcache'; // Public because used in config
-
-    use DriverBaseTrait;
-
-    /**
-     * @var Collection
-     */
-    public $collection;
-
-    /**
-     * @var Database
-     */
-    public $database;
-
-    /**
-     * @return bool
-     */
-    public function driverCheck(): bool
-    {
-        $mongoExtensionExists = class_exists(Manager::class);
-
-        if (!$mongoExtensionExists && class_exists(MongoClient::class)) {
-            trigger_error(
-                'This driver is used to support the pecl MongoDb extension with mongo-php-library.
+	public const MONGODB_DEFAULT_DB_NAME = 'phpfastcache'; // Public because used in config
+
+	use DriverBaseTrait;
+
+	/**
+	 * @var Collection
+	 */
+	public $collection;
+
+	/**
+	 * @var Database
+	 */
+	public $database;
+
+	/**
+	 * @return bool
+	 */
+	public function driverCheck(): bool
+	{
+		$mongoExtensionExists = class_exists(Manager::class);
+
+		if (!$mongoExtensionExists && class_exists(MongoClient::class)) {
+			trigger_error(
+				'This driver is used to support the pecl MongoDb extension with mongo-php-library.
             For MongoDb with Mongo PECL support use Mongo Driver.',
-                E_USER_ERROR
-            );
-        }
-
-        return $mongoExtensionExists && class_exists(Collection::class);
-    }
-
-    /**
-     * @return DriverStatistic
-     */
-    public function getStats(): DriverStatistic
-    {
-        $serverStats = $this->instance->getManager()->executeCommand(
-            $this->getConfig()->getDatabaseName(),
-            new Command(
-                [
-                    'serverStatus' => 1,
-                    'recordStats' => 0,
-                    'repl' => 0,
-                    'metrics' => 0,
-                ]
-            )
-        )->toArray()[0];
-
-        $collectionStats = $this->instance->getManager()->executeCommand(
-            $this->getConfig()->getDatabaseName(),
-            new Command(
-                [
-                    'collStats' => $this->getConfig()->getCollectionName(),
-                    'verbose' => true,
-                ]
-            )
-        )->toArray()[0];
-
-        $array_filter_recursive = static function ($array, callable $callback = null) use (&$array_filter_recursive) {
-            $array = $callback($array);
-
-            if (\is_object($array) || \is_array($array)) {
-                foreach ($array as &$value) {
-                    $value = $array_filter_recursive($value, $callback);
-                }
-            }
-
-            return $array;
-        };
-
-        $callback = static function ($item) {
-            /**
-             * Remove unserializable properties
-             */
-            if ($item instanceof UTCDateTime) {
-                return (string)$item;
-            }
-            return $item;
-        };
-
-        $serverStats = $array_filter_recursive($serverStats, $callback);
-        $collectionStats = $array_filter_recursive($collectionStats, $callback);
-
-        $stats = (new DriverStatistic())
-            ->setInfo(
-                'MongoDB version ' . $serverStats->version . ', Uptime (in days): ' . round(
-                    $serverStats->uptime / 86400,
-                    1
-                ) . "\n For more information see RawData."
-            )
-            ->setSize($collectionStats->size)
-            ->setData(implode(', ', array_keys($this->itemInstances)))
-            ->setRawData(
-                [
-                    'serverStatus' => $serverStats,
-                    'collStats' => $collectionStats,
-                ]
-            );
-
-        return $stats;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return null|array
-     */
-    protected function driverRead(CacheItemInterface $item)
-    {
-        $document = $this->getCollection()->findOne(['_id' => $this->getMongoDbItemKey($item)]);
-
-        if ($document) {
-            $return = [
-                self::DRIVER_DATA_WRAPPER_INDEX => $this->decode($document[self::DRIVER_DATA_WRAPPER_INDEX]->getData()),
-                self::DRIVER_TAGS_WRAPPER_INDEX => $document[self::DRIVER_TAGS_WRAPPER_INDEX]->jsonSerialize(),
-                self::DRIVER_EDATE_WRAPPER_INDEX => $document[self::DRIVER_EDATE_WRAPPER_INDEX]->toDateTime(),
-            ];
-
-            if (!empty($this->getConfig()->isItemDetailedDate())) {
-                $return += [
-                    self::DRIVER_MDATE_WRAPPER_INDEX => $document[self::DRIVER_MDATE_WRAPPER_INDEX]->toDateTime(),
-                    self::DRIVER_CDATE_WRAPPER_INDEX => $document[self::DRIVER_CDATE_WRAPPER_INDEX]->toDateTime(),
-                ];
-            }
-
-            return $return;
-        }
-
-        return null;
-    }
-
-    /**
-     * @return Collection
-     */
-    protected function getCollection(): Collection
-    {
-        return $this->collection;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return mixed
-     * @throws PhpfastcacheInvalidArgumentException
-     * @throws PhpfastcacheDriverException
-     */
-    protected function driverWrite(CacheItemInterface $item): bool
-    {
-        /**
-         * Check for Cross-Driver type confusion
-         */
-        if ($item instanceof Item) {
-            try {
-                $set = [
-                    self::DRIVER_KEY_WRAPPER_INDEX => $item->getKey(),
-                    self::DRIVER_DATA_WRAPPER_INDEX => new Binary($this->encode($item->get()), Binary::TYPE_GENERIC),
-                    self::DRIVER_TAGS_WRAPPER_INDEX => $item->getTags(),
-                    self::DRIVER_EDATE_WRAPPER_INDEX => new UTCDateTime($item->getExpirationDate()),
-                ];
-
-                if (!empty($this->getConfig()->isItemDetailedDate())) {
-                    $set += [
-                        self::DRIVER_MDATE_WRAPPER_INDEX =>  new UTCDateTime($item->getModificationDate()),
-                        self::DRIVER_CDATE_WRAPPER_INDEX =>  new UTCDateTime($item->getCreationDate()),
-                    ];
-                }
-                $result = (array)$this->getCollection()->updateOne(
-                    ['_id' => $this->getMongoDbItemKey($item)],
-                    [
-                        '$set' => $set,
-                    ],
-                    ['upsert' => true, 'multiple' => false]
-                );
-            } catch (MongoDBException $e) {
-                throw new PhpfastcacheDriverException('Got an exception while trying to write data to MongoDB server: ' . $e->getMessage(), 0, $e);
-            }
-
-            return isset($result['ok']) ? $result['ok'] == 1 : true;
-        }
-
-        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) {
-            /**
-             * @var DeleteResult $deletionResult
-             */
-            $deletionResult = $this->getCollection()->deleteOne(['_id' =>  $this->getMongoDbItemKey($item)]);
-
-            return $deletionResult->isAcknowledged();
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /**
-     * @return bool
-     */
-    protected function driverClear(): bool
-    {
-        try {
-           return $this->collection->deleteMany([])->isAcknowledged();
-        } catch (MongoDBException $e) {
-            throw new PhpfastcacheDriverException('Got error while trying to empty the collection: ' . $e->getMessage(), 0, $e);
-        }
-    }
-
-    /**
-     * @return bool
-     * @throws MongodbException
-     * @throws LogicException
-     */
-    protected function driverConnect(): bool
-    {
-        if ($this->instance instanceof Client) {
-            throw new LogicException('Already connected to Mongodb server');
-        }
-
-        $timeout = $this->getConfig()->getTimeout() * 1000;
-        $collectionName = $this->getConfig()->getCollectionName();
-        $databaseName = $this->getConfig()->getDatabaseName();
-        $driverOptions = $this->getConfig()->getDriverOptions();
-
-        $this->instance = $this->instance ?: new Client($this->buildConnectionURI($databaseName), ['connectTimeoutMS' => $timeout], $driverOptions);
-        $this->database = $this->database ?: $this->instance->selectDatabase($databaseName);
-
-        if (!$this->collectionExists($collectionName)) {
-            $this->database->createCollection($collectionName);
-            $this->database->selectCollection($collectionName)
-                ->createIndex(
-                    [self::DRIVER_KEY_WRAPPER_INDEX => 1],
-                    ['unique' => true, 'name' => 'unique_key_index']
-                );
-            $this->database->selectCollection($collectionName)
-                ->createIndex(
-                    [self::DRIVER_EDATE_WRAPPER_INDEX => 1],
-                    ['expireAfterSeconds' => 0,  'name' => 'auto_expire_index']
-                );
-        }
-
-        $this->collection = $this->database->selectCollection($collectionName);
-
-        return true;
-    }
-
-    /**
-     * Builds the connection URI from the given parameters.
-     *
-     * @param string $databaseName
-     * @return string The connection URI.
-     */
-    protected function buildConnectionURI(string $databaseName): string
-    {
-        $databaseName = \urlencode($databaseName);
-        $servers = $this->getConfig()->getServers();
-        $options = $this->getConfig()->getOptions();
-
-        $protocol = $this->getConfig()->getProtocol();
-        $host = $this->getConfig()->getHost();
-        $port = $this->getConfig()->getPort();
-        $username = $this->getConfig()->getUsername();
-        $password = $this->getConfig()->getPassword();
-
-        if (count($servers) > 0) {
-            $host = array_reduce(
-                $servers,
-                static function ($carry, $data) {
-                    $carry .= ($carry === '' ? '' : ',') . $data['host'] . ':' . $data['port'];
-                    return $carry;
-                },
-                ''
-            );
-            $port = false;
-        }
-
-        return implode(
-            '',
-            [
-                "{$protocol}://",
-                $username ?: '',
-                $password ? ":{$password}" : '',
-                $username ? '@' : '',
-                $host,
-                $port !== 27017 && $port !== false ? ":{$port}" : '',
-                $databaseName ? "/{$databaseName}" : '',
-                count($options) > 0 ? '?' . http_build_query($options) : '',
-            ]
-        );
-    }
-
-    protected function getMongoDbItemKey(CacheItemInterface $item)
-    {
-        return 'pfc_' . $item->getEncodedKey();
-    }
-
-    /********************
+				E_USER_ERROR
+			);
+		}
+
+		return $mongoExtensionExists && class_exists(Collection::class);
+	}
+
+	/**
+	 * @return DriverStatistic
+	 */
+	public function getStats(): DriverStatistic
+	{
+		$serverStats = $this->instance->getManager()->executeCommand(
+			$this->getConfig()->getDatabaseName(),
+			new Command(
+				[
+					'serverStatus' => 1,
+					'recordStats' => 0,
+					'repl' => 0,
+					'metrics' => 0,
+				]
+			)
+		)->toArray()[0];
+
+		$collectionStats = $this->instance->getManager()->executeCommand(
+			$this->getConfig()->getDatabaseName(),
+			new Command(
+				[
+					'collStats' => $this->getConfig()->getCollectionName(),
+					'verbose' => true,
+				]
+			)
+		)->toArray()[0];
+
+		$array_filter_recursive = static function ($array, callable $callback = null) use (&$array_filter_recursive) {
+			$array = $callback($array);
+
+			if (\is_object($array) || \is_array($array)) {
+				foreach ($array as &$value) {
+					$value = $array_filter_recursive($value, $callback);
+				}
+			}
+
+			return $array;
+		};
+
+		$callback = static function ($item) {
+			/**
+			 * Remove unserializable properties
+			 */
+			if ($item instanceof UTCDateTime) {
+				return (string)$item;
+			}
+			return $item;
+		};
+
+		$serverStats = $array_filter_recursive($serverStats, $callback);
+		$collectionStats = $array_filter_recursive($collectionStats, $callback);
+
+		$stats = (new DriverStatistic())
+			->setInfo(
+				'MongoDB version ' . $serverStats->version . ', Uptime (in days): ' . round(
+					$serverStats->uptime / 86400,
+					1
+				) . "\n For more information see RawData."
+			)
+			->setSize($collectionStats->size)
+			->setData(implode(', ', array_keys($this->itemInstances)))
+			->setRawData(
+				[
+					'serverStatus' => $serverStats,
+					'collStats' => $collectionStats,
+				]
+			);
+
+		return $stats;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return null|array
+	 */
+	protected function driverRead(CacheItemInterface $item)
+	{
+		$document = $this->getCollection()->findOne(['_id' => $this->getMongoDbItemKey($item)]);
+
+		if ($document) {
+			$return = [
+				self::DRIVER_DATA_WRAPPER_INDEX => $this->decode($document[self::DRIVER_DATA_WRAPPER_INDEX]->getData()),
+				self::DRIVER_TAGS_WRAPPER_INDEX => $document[self::DRIVER_TAGS_WRAPPER_INDEX]->jsonSerialize(),
+				self::DRIVER_EDATE_WRAPPER_INDEX => $document[self::DRIVER_EDATE_WRAPPER_INDEX]->toDateTime(),
+			];
+
+			if (!empty($this->getConfig()->isItemDetailedDate())) {
+				$return += [
+					self::DRIVER_MDATE_WRAPPER_INDEX => $document[self::DRIVER_MDATE_WRAPPER_INDEX]->toDateTime(),
+					self::DRIVER_CDATE_WRAPPER_INDEX => $document[self::DRIVER_CDATE_WRAPPER_INDEX]->toDateTime(),
+				];
+			}
+
+			return $return;
+		}
+
+		return null;
+	}
+
+	/**
+	 * @return Collection
+	 */
+	protected function getCollection(): Collection
+	{
+		return $this->collection;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return mixed
+	 * @throws PhpfastcacheInvalidArgumentException
+	 * @throws PhpfastcacheDriverException
+	 */
+	protected function driverWrite(CacheItemInterface $item): bool
+	{
+		/**
+		 * Check for Cross-Driver type confusion
+		 */
+		if ($item instanceof Item) {
+			try {
+				$set = [
+					self::DRIVER_KEY_WRAPPER_INDEX => $item->getKey(),
+					self::DRIVER_DATA_WRAPPER_INDEX => new Binary($this->encode($item->get()), Binary::TYPE_GENERIC),
+					self::DRIVER_TAGS_WRAPPER_INDEX => $item->getTags(),
+					self::DRIVER_EDATE_WRAPPER_INDEX => new UTCDateTime($item->getExpirationDate()),
+				];
+
+				if (!empty($this->getConfig()->isItemDetailedDate())) {
+					$set += [
+						self::DRIVER_MDATE_WRAPPER_INDEX =>  new UTCDateTime($item->getModificationDate()),
+						self::DRIVER_CDATE_WRAPPER_INDEX =>  new UTCDateTime($item->getCreationDate()),
+					];
+				}
+				$result = (array)$this->getCollection()->updateOne(
+					['_id' => $this->getMongoDbItemKey($item)],
+					[
+						'$set' => $set,
+					],
+					['upsert' => true, 'multiple' => false]
+				);
+			} catch (MongoDBException $e) {
+				throw new PhpfastcacheDriverException('Got an exception while trying to write data to MongoDB server: ' . $e->getMessage(), 0, $e);
+			}
+
+			return isset($result['ok']) ? $result['ok'] == 1 : true;
+		}
+
+		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) {
+			/**
+			 * @var DeleteResult $deletionResult
+			 */
+			$deletionResult = $this->getCollection()->deleteOne(['_id' =>  $this->getMongoDbItemKey($item)]);
+
+			return $deletionResult->isAcknowledged();
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function driverClear(): bool
+	{
+		try {
+		   return $this->collection->deleteMany([])->isAcknowledged();
+		} catch (MongoDBException $e) {
+			throw new PhpfastcacheDriverException('Got error while trying to empty the collection: ' . $e->getMessage(), 0, $e);
+		}
+	}
+
+	/**
+	 * @return bool
+	 * @throws MongodbException
+	 * @throws LogicException
+	 */
+	protected function driverConnect(): bool
+	{
+		if ($this->instance instanceof Client) {
+			throw new LogicException('Already connected to Mongodb server');
+		}
+
+		$timeout = $this->getConfig()->getTimeout() * 1000;
+		$collectionName = $this->getConfig()->getCollectionName();
+		$databaseName = $this->getConfig()->getDatabaseName();
+		$driverOptions = $this->getConfig()->getDriverOptions();
+
+		$this->instance = $this->instance ?: new Client($this->buildConnectionURI($databaseName), ['connectTimeoutMS' => $timeout], $driverOptions);
+		$this->database = $this->database ?: $this->instance->selectDatabase($databaseName);
+
+		if (!$this->collectionExists($collectionName)) {
+			$this->database->createCollection($collectionName);
+			$this->database->selectCollection($collectionName)
+				->createIndex(
+					[self::DRIVER_KEY_WRAPPER_INDEX => 1],
+					['unique' => true, 'name' => 'unique_key_index']
+				);
+			$this->database->selectCollection($collectionName)
+				->createIndex(
+					[self::DRIVER_EDATE_WRAPPER_INDEX => 1],
+					['expireAfterSeconds' => 0,  'name' => 'auto_expire_index']
+				);
+		}
+
+		$this->collection = $this->database->selectCollection($collectionName);
+
+		return true;
+	}
+
+	/**
+	 * Builds the connection URI from the given parameters.
+	 *
+	 * @param string $databaseName
+	 * @return string The connection URI.
+	 */
+	protected function buildConnectionURI(string $databaseName): string
+	{
+		$databaseName = \urlencode($databaseName);
+		$servers = $this->getConfig()->getServers();
+		$options = $this->getConfig()->getOptions();
+
+		$protocol = $this->getConfig()->getProtocol();
+		$host = $this->getConfig()->getHost();
+		$port = $this->getConfig()->getPort();
+		$username = $this->getConfig()->getUsername();
+		$password = $this->getConfig()->getPassword();
+
+		if (count($servers) > 0) {
+			$host = array_reduce(
+				$servers,
+				static function ($carry, $data) {
+					$carry .= ($carry === '' ? '' : ',') . $data['host'] . ':' . $data['port'];
+					return $carry;
+				},
+				''
+			);
+			$port = false;
+		}
+
+		return implode(
+			'',
+			[
+				"{$protocol}://",
+				$username ?: '',
+				$password ? ":{$password}" : '',
+				$username ? '@' : '',
+				$host,
+				$port !== 27017 && $port !== false ? ":{$port}" : '',
+				$databaseName ? "/{$databaseName}" : '',
+				count($options) > 0 ? '?' . http_build_query($options) : '',
+			]
+		);
+	}
+
+	protected function getMongoDbItemKey(CacheItemInterface $item)
+	{
+		return 'pfc_' . $item->getEncodedKey();
+	}
+
+	/********************
      *
      * PSR-6 Extended Methods
      *
      *******************/
 
-    /**
-     * Checks if a collection name exists on the Mongo database.
-     *
-     * @param string $collectionName The collection name to check.
-     *
-     * @return bool True if the collection exists, false if not.
-     */
-    protected function collectionExists($collectionName): bool
-    {
-        foreach ($this->database->listCollections() as $collection) {
-            if ($collection->getName() === $collectionName) {
-                return true;
-            }
-        }
-
-        return false;
-    }
+	/**
+	 * Checks if a collection name exists on the Mongo database.
+	 *
+	 * @param string $collectionName The collection name to check.
+	 *
+	 * @return bool True if the collection exists, false if not.
+	 */
+	protected function collectionExists($collectionName): bool
+	{
+		foreach ($this->database->listCollections() as $collection) {
+			if ($collection->getName() === $collectionName) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 }

Braces +6 added lines, -6 removed lines

@@ -143,8 +143,7 @@ 
      * @param CacheItemInterface $item
      * @return null|array
      */
-    protected function driverRead(CacheItemInterface $item)
-    {
+    protected function driverRead(CacheItemInterface $item) {
         $document = $this->getCollection()->findOne(['_id' => $this->getMongoDbItemKey($item)]);
 
         if ($document) {
@@ -208,7 +207,8 @@ 
                     ],
                     ['upsert' => true, 'multiple' => false]
                 );
-            } catch (MongoDBException $e) {
+            }
+            catch (MongoDBException $e) {
                 throw new PhpfastcacheDriverException('Got an exception while trying to write data to MongoDB server: ' . $e->getMessage(), 0, $e);
             }
 
@@ -247,7 +247,8 @@ 
     {
         try {
            return $this->collection->deleteMany([])->isAcknowledged();
-        } catch (MongoDBException $e) {
+        }
+        catch (MongoDBException $e) {
             throw new PhpfastcacheDriverException('Got error while trying to empty the collection: ' . $e->getMessage(), 0, $e);
         }
     }
@@ -335,8 +336,7 @@ 
         );
     }
 
-    protected function getMongoDbItemKey(CacheItemInterface $item)
-    {
+    protected function getMongoDbItemKey(CacheItemInterface $item) {
         return 'pfc_' . $item->getEncodedKey();
     }
 

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

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
             /**
              * CouchbaseBucket::get() returns a GetResult interface
              */
-            return $this->decodeDocument((array)$this->getCollection()->get($item->getEncodedKey())->content());
+            return $this->decodeDocument((array) $this->getCollection()->get($item->getEncodedKey())->content());
         } catch (DocumentNotFoundException $e) {
             return null;
         }
@@ -161,7 +161,7 @@ 
             ->setSize(0)
             ->setRawData($info)
             ->setData(implode(', ', array_keys($this->itemInstances)))
-            ->setInfo( $info['sdk'] . "\n For more information see RawData.");
+            ->setInfo($info['sdk'] . "\n For more information see RawData.");
     }
 
     /**

Indentation +166 added lines, -166 removed lines

@@ -33,170 +33,170 @@
  */
 class Driver extends CoubaseV2Driver
 {
-    /**
-     * @var Scope
-     */
-    protected $scope;
-
-    /**
-     * @var Collection
-     */
-    protected $collection;
-
-    public function __construct(ConfigurationOption $config, $instanceId)
-    {
-        $this->__baseConstruct($config, $instanceId);
-    }
-
-    /**
-     * @return bool
-     * @throws PhpfastcacheLogicException
-     */
-    protected function driverConnect(): bool
-    {
-        if (!\class_exists(ClusterOptions::class)) {
-            throw new PhpfastcacheDriverCheckException('You are using the Couchbase PHP SDK 2.x so please use driver Couchbasev3');
-        }
-
-        $connectionString = "couchbase://{$this->getConfig()->getHost()}:{$this->getConfig()->getPort()}";
-
-        $options = new ClusterOptions();
-        $options->credentials($this->getConfig()->getUsername(), $this->getConfig()->getPassword());
-        $this->instance = new Cluster($connectionString, $options);
-
-        $this->setBucket($this->instance->bucket($this->getConfig()->getBucketName()));
-        $this->setScope($this->getBucket()->scope($this->getConfig()->getScopeName()));
-        $this->setCollection($this->getScope()->collection($this->getConfig()->getCollectionName()));
-
-        return true;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return null|array
-     */
-    protected function driverRead(CacheItemInterface $item)
-    {
-        try {
-            /**
-             * CouchbaseBucket::get() returns a GetResult interface
-             */
-            return $this->decodeDocument((array)$this->getCollection()->get($item->getEncodedKey())->content());
-        } catch (DocumentNotFoundException $e) {
-            return null;
-        }
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return bool
-     * @throws PhpfastcacheInvalidArgumentException
-     */
-    protected function driverWrite(CacheItemInterface $item): bool
-    {
-        /**
-         * Check for Cross-Driver type confusion
-         */
-        if ($item instanceof Item) {
-            try {
-                $this->getCollection()->upsert(
-                    $item->getEncodedKey(),
-                    $this->encodeDocument($this->driverPreWrap($item)),
-                    (new UpsertOptions())->expiry($item->getTtl())
-                );
-                return true;
-            } catch (CouchbaseException $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) {
-            try {
-                $this->getCollection()->remove($item->getEncodedKey());
-                return true;
-            } catch (DocumentNotFoundException $e) {
-                return true;
-            } catch (CouchbaseException $e) {
-                return false;
-            }
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /**
-     * @return bool
-     */
-    protected function driverClear(): bool
-    {
-        $this->instance->buckets()->flush($this->getConfig()->getBucketName());
-        return true;
-    }
-
-    /**
-     * @return DriverStatistic
-     */
-    public function getStats(): DriverStatistic
-    {
-        /**
-         * Between SDK 2 and 3 we lost a lot of useful information :(
-         * @see https://docs.couchbase.com/java-sdk/current/project-docs/migrating-sdk-code-to-3.n.html#management-apis
-         */
-        $info = $this->getBucket()->diagnostics(\bin2hex(\random_bytes(16)));
-
-        return (new DriverStatistic())
-            ->setSize(0)
-            ->setRawData($info)
-            ->setData(implode(', ', array_keys($this->itemInstances)))
-            ->setInfo( $info['sdk'] . "\n For more information see RawData.");
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getCollection(): Collection
-    {
-        return $this->collection;
-    }
-
-    /**
-     * @param Collection $collection
-     * @return Driver
-     */
-    public function setCollection(Collection $collection): Driver
-    {
-        $this->collection = $collection;
-        return $this;
-    }
-
-    /**
-     * @return Scope
-     */
-    public function getScope(): Scope
-    {
-        return $this->scope;
-    }
-
-    /**
-     * @param Scope $scope
-     * @return Driver
-     */
-    public function setScope(Scope $scope): Driver
-    {
-        $this->scope = $scope;
-        return $this;
-    }
+	/**
+	 * @var Scope
+	 */
+	protected $scope;
+
+	/**
+	 * @var Collection
+	 */
+	protected $collection;
+
+	public function __construct(ConfigurationOption $config, $instanceId)
+	{
+		$this->__baseConstruct($config, $instanceId);
+	}
+
+	/**
+	 * @return bool
+	 * @throws PhpfastcacheLogicException
+	 */
+	protected function driverConnect(): bool
+	{
+		if (!\class_exists(ClusterOptions::class)) {
+			throw new PhpfastcacheDriverCheckException('You are using the Couchbase PHP SDK 2.x so please use driver Couchbasev3');
+		}
+
+		$connectionString = "couchbase://{$this->getConfig()->getHost()}:{$this->getConfig()->getPort()}";
+
+		$options = new ClusterOptions();
+		$options->credentials($this->getConfig()->getUsername(), $this->getConfig()->getPassword());
+		$this->instance = new Cluster($connectionString, $options);
+
+		$this->setBucket($this->instance->bucket($this->getConfig()->getBucketName()));
+		$this->setScope($this->getBucket()->scope($this->getConfig()->getScopeName()));
+		$this->setCollection($this->getScope()->collection($this->getConfig()->getCollectionName()));
+
+		return true;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return null|array
+	 */
+	protected function driverRead(CacheItemInterface $item)
+	{
+		try {
+			/**
+			 * CouchbaseBucket::get() returns a GetResult interface
+			 */
+			return $this->decodeDocument((array)$this->getCollection()->get($item->getEncodedKey())->content());
+		} catch (DocumentNotFoundException $e) {
+			return null;
+		}
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return bool
+	 * @throws PhpfastcacheInvalidArgumentException
+	 */
+	protected function driverWrite(CacheItemInterface $item): bool
+	{
+		/**
+		 * Check for Cross-Driver type confusion
+		 */
+		if ($item instanceof Item) {
+			try {
+				$this->getCollection()->upsert(
+					$item->getEncodedKey(),
+					$this->encodeDocument($this->driverPreWrap($item)),
+					(new UpsertOptions())->expiry($item->getTtl())
+				);
+				return true;
+			} catch (CouchbaseException $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) {
+			try {
+				$this->getCollection()->remove($item->getEncodedKey());
+				return true;
+			} catch (DocumentNotFoundException $e) {
+				return true;
+			} catch (CouchbaseException $e) {
+				return false;
+			}
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function driverClear(): bool
+	{
+		$this->instance->buckets()->flush($this->getConfig()->getBucketName());
+		return true;
+	}
+
+	/**
+	 * @return DriverStatistic
+	 */
+	public function getStats(): DriverStatistic
+	{
+		/**
+		 * Between SDK 2 and 3 we lost a lot of useful information :(
+		 * @see https://docs.couchbase.com/java-sdk/current/project-docs/migrating-sdk-code-to-3.n.html#management-apis
+		 */
+		$info = $this->getBucket()->diagnostics(\bin2hex(\random_bytes(16)));
+
+		return (new DriverStatistic())
+			->setSize(0)
+			->setRawData($info)
+			->setData(implode(', ', array_keys($this->itemInstances)))
+			->setInfo( $info['sdk'] . "\n For more information see RawData.");
+	}
+
+	/**
+	 * @return Collection
+	 */
+	public function getCollection(): Collection
+	{
+		return $this->collection;
+	}
+
+	/**
+	 * @param Collection $collection
+	 * @return Driver
+	 */
+	public function setCollection(Collection $collection): Driver
+	{
+		$this->collection = $collection;
+		return $this;
+	}
+
+	/**
+	 * @return Scope
+	 */
+	public function getScope(): Scope
+	{
+		return $this->scope;
+	}
+
+	/**
+	 * @param Scope $scope
+	 * @return Driver
+	 */
+	public function setScope(Scope $scope): Driver
+	{
+		$this->scope = $scope;
+		return $this;
+	}
 }

Braces +10 added lines, -8 removed lines

@@ -43,8 +43,7 @@ 
      */
     protected $collection;
 
-    public function __construct(ConfigurationOption $config, $instanceId)
-    {
+    public function __construct(ConfigurationOption $config, $instanceId) {
         $this->__baseConstruct($config, $instanceId);
     }
 
@@ -75,14 +74,14 @@ 
      * @param CacheItemInterface $item
      * @return null|array
      */
-    protected function driverRead(CacheItemInterface $item)
-    {
+    protected function driverRead(CacheItemInterface $item) {
         try {
             /**
              * CouchbaseBucket::get() returns a GetResult interface
              */
             return $this->decodeDocument((array)$this->getCollection()->get($item->getEncodedKey())->content());
-        } catch (DocumentNotFoundException $e) {
+        }
+        catch (DocumentNotFoundException $e) {
             return null;
         }
     }
@@ -105,7 +104,8 @@ 
                     (new UpsertOptions())->expiry($item->getTtl())
                 );
                 return true;
-            } catch (CouchbaseException $e) {
+            }
+            catch (CouchbaseException $e) {
                 return false;
             }
         }
@@ -127,9 +127,11 @@ 
             try {
                 $this->getCollection()->remove($item->getEncodedKey());
                 return true;
-            } catch (DocumentNotFoundException $e) {
+            }
+            catch (DocumentNotFoundException $e) {
                 return true;
-            } catch (CouchbaseException $e) {
+            }
+            catch (CouchbaseException $e) {
                 return false;
             }
         }

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

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
      */
     public function getStats(): DriverStatistic
     {
-        $stats = (array)$this->instance->getstats();
+        $stats = (array) $this->instance->getstats();
         $stats['uptime'] = (isset($stats['uptime']) ? $stats['uptime'] : 0);
         $stats['version'] = (isset($stats['version']) ? $stats['version'] : 'UnknownVersion');
         $stats['bytes'] = (isset($stats['bytes']) ? $stats['version'] : 0);
@@ -83,7 +83,7 @@ 
             ->setData(implode(', ', array_keys($this->itemInstances)))
             ->setInfo(sprintf("The memcache daemon v%s is up since %s.\n For more information see RawData.", $stats['version'], $date->format(DATE_RFC2822)))
             ->setRawData($stats)
-            ->setSize((int)$stats['bytes']);
+            ->setSize((int) $stats['bytes']);
     }
 
     /**

Indentation +161 added lines, -161 removed lines

@@ -37,170 +37,170 @@
  */
 class Driver implements ExtendedCacheItemPoolInterface, AggregatablePoolInterface
 {
-    use DriverBaseTrait {
-        __construct as protected __parentConstruct;
-    }
-    use MemcacheDriverCollisionDetectorTrait;
-
-    /**
-     * @var int
-     */
-    protected $memcacheFlags = 0;
-
-    /**
-     * Driver constructor.
-     * @param ConfigurationOption $config
-     * @param string $instanceId
-     * @throws PhpfastcacheDriverException
-     */
-    public function __construct(ConfigurationOption $config, string $instanceId)
-    {
-        self::checkCollision('Memcache');
-        $this->__parentConstruct($config, $instanceId);
-    }
-
-    /**
-     * @return bool
-     */
-    public function driverCheck(): bool
-    {
-        return class_exists('Memcache');
-    }
-
-    /**
-     * @return DriverStatistic
-     */
-    public function getStats(): DriverStatistic
-    {
-        $stats = (array)$this->instance->getstats();
-        $stats['uptime'] = (isset($stats['uptime']) ? $stats['uptime'] : 0);
-        $stats['version'] = (isset($stats['version']) ? $stats['version'] : 'UnknownVersion');
-        $stats['bytes'] = (isset($stats['bytes']) ? $stats['version'] : 0);
-
-        $date = (new DateTime())->setTimestamp(time() - $stats['uptime']);
-
-        return (new DriverStatistic())
-            ->setData(implode(', ', array_keys($this->itemInstances)))
-            ->setInfo(sprintf("The memcache daemon v%s is up since %s.\n For more information see RawData.", $stats['version'], $date->format(DATE_RFC2822)))
-            ->setRawData($stats)
-            ->setSize((int)$stats['bytes']);
-    }
-
-    /**
-     * @return bool
-     */
-    protected function driverConnect(): bool
-    {
-        $this->instance = new MemcacheSoftware();
-
-        if (count($this->getConfig()->getServers()) < 1) {
-            $this->getConfig()->setServers(
-               [
-                    [
-                        'host' => $this->getConfig()->getHost(),
-                        'path' => $this->getConfig()->getPath(),
-                        'port' => $this->getConfig()->getPort(),
-                    ]
-                ]
-            );
-        }
-
-        foreach ($this->getConfig()->getServers() as $server) {
-            try {
-                /**
-                 * If path is provided we consider it as an UNIX Socket
-                 */
-                if (!empty($server['path']) && !$this->instance->addServer($server['path'], 0)) {
-                    $this->fallback = true;
-                } elseif (!empty($server['host']) && !$this->instance->addServer($server['host'], $server['port'])) {
-                    $this->fallback = true;
-                }
-            } catch (Exception $e) {
-                $this->fallback = true;
-            }
-
-            /**
-             * Since Memcached does not throw
-             * any error if not connected ...
-             */
-            if (!$this->instance->getServerStatus(
-                !empty($server['path']) ? $server['path'] : $server['host'],
-                !empty($server['port']) ? $server['port'] : 0
-            )) {
-                throw new PhpfastcacheDriverException('Memcache seems to not be connected');
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * @param CacheItemInterface $item
-     * @return null|array
-     */
-    protected function driverRead(CacheItemInterface $item)
-    {
-        $val = $this->instance->get($item->getKey());
-
-        if ($val === false) {
-            return null;
-        }
-
-        return $val;
-    }
-
-    /**
-     * @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();
-
-            // Memcache will only allow a expiration timer less than 2592000 seconds,
-            // otherwise, it will assume you're giving it a UNIX timestamp.
-            if ($ttl > 2592000) {
-                $ttl = time() + $ttl;
-            }
-            return $this->instance->set($item->getKey(), $this->driverPreWrap($item), $this->memcacheFlags, $ttl);
-        }
-
-        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 $this->instance->delete($item->getKey());
-        }
-
-        throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
-    }
-
-    /********************
+	use DriverBaseTrait {
+		__construct as protected __parentConstruct;
+	}
+	use MemcacheDriverCollisionDetectorTrait;
+
+	/**
+	 * @var int
+	 */
+	protected $memcacheFlags = 0;
+
+	/**
+	 * Driver constructor.
+	 * @param ConfigurationOption $config
+	 * @param string $instanceId
+	 * @throws PhpfastcacheDriverException
+	 */
+	public function __construct(ConfigurationOption $config, string $instanceId)
+	{
+		self::checkCollision('Memcache');
+		$this->__parentConstruct($config, $instanceId);
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function driverCheck(): bool
+	{
+		return class_exists('Memcache');
+	}
+
+	/**
+	 * @return DriverStatistic
+	 */
+	public function getStats(): DriverStatistic
+	{
+		$stats = (array)$this->instance->getstats();
+		$stats['uptime'] = (isset($stats['uptime']) ? $stats['uptime'] : 0);
+		$stats['version'] = (isset($stats['version']) ? $stats['version'] : 'UnknownVersion');
+		$stats['bytes'] = (isset($stats['bytes']) ? $stats['version'] : 0);
+
+		$date = (new DateTime())->setTimestamp(time() - $stats['uptime']);
+
+		return (new DriverStatistic())
+			->setData(implode(', ', array_keys($this->itemInstances)))
+			->setInfo(sprintf("The memcache daemon v%s is up since %s.\n For more information see RawData.", $stats['version'], $date->format(DATE_RFC2822)))
+			->setRawData($stats)
+			->setSize((int)$stats['bytes']);
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function driverConnect(): bool
+	{
+		$this->instance = new MemcacheSoftware();
+
+		if (count($this->getConfig()->getServers()) < 1) {
+			$this->getConfig()->setServers(
+			   [
+					[
+						'host' => $this->getConfig()->getHost(),
+						'path' => $this->getConfig()->getPath(),
+						'port' => $this->getConfig()->getPort(),
+					]
+				]
+			);
+		}
+
+		foreach ($this->getConfig()->getServers() as $server) {
+			try {
+				/**
+				 * If path is provided we consider it as an UNIX Socket
+				 */
+				if (!empty($server['path']) && !$this->instance->addServer($server['path'], 0)) {
+					$this->fallback = true;
+				} elseif (!empty($server['host']) && !$this->instance->addServer($server['host'], $server['port'])) {
+					$this->fallback = true;
+				}
+			} catch (Exception $e) {
+				$this->fallback = true;
+			}
+
+			/**
+			 * Since Memcached does not throw
+			 * any error if not connected ...
+			 */
+			if (!$this->instance->getServerStatus(
+				!empty($server['path']) ? $server['path'] : $server['host'],
+				!empty($server['port']) ? $server['port'] : 0
+			)) {
+				throw new PhpfastcacheDriverException('Memcache seems to not be connected');
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param CacheItemInterface $item
+	 * @return null|array
+	 */
+	protected function driverRead(CacheItemInterface $item)
+	{
+		$val = $this->instance->get($item->getKey());
+
+		if ($val === false) {
+			return null;
+		}
+
+		return $val;
+	}
+
+	/**
+	 * @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();
+
+			// Memcache will only allow a expiration timer less than 2592000 seconds,
+			// otherwise, it will assume you're giving it a UNIX timestamp.
+			if ($ttl > 2592000) {
+				$ttl = time() + $ttl;
+			}
+			return $this->instance->set($item->getKey(), $this->driverPreWrap($item), $this->memcacheFlags, $ttl);
+		}
+
+		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 $this->instance->delete($item->getKey());
+		}
+
+		throw new PhpfastcacheInvalidArgumentException('Cross-Driver type confusion detected');
+	}
+
+	/********************
      *
      * PSR-6 Extended Methods
      *
      *******************/
 
-    /**
-     * @return bool
-     */
-    protected function driverClear(): bool
-    {
-        return $this->instance->flush();
-    }
+	/**
+	 * @return bool
+	 */
+	protected function driverClear(): bool
+	{
+		return $this->instance->flush();
+	}
 }

Braces +6 added lines, -6 removed lines

@@ -53,8 +53,7 @@ 
      * @param string $instanceId
      * @throws PhpfastcacheDriverException
      */
-    public function __construct(ConfigurationOption $config, string $instanceId)
-    {
+    public function __construct(ConfigurationOption $config, string $instanceId) {
         self::checkCollision('Memcache');
         $this->__parentConstruct($config, $instanceId);
     }
@@ -112,10 +111,12 @@ 
                  */
                 if (!empty($server['path']) && !$this->instance->addServer($server['path'], 0)) {
                     $this->fallback = true;
-                } elseif (!empty($server['host']) && !$this->instance->addServer($server['host'], $server['port'])) {
+                }
+                elseif (!empty($server['host']) && !$this->instance->addServer($server['host'], $server['port'])) {
                     $this->fallback = true;
                 }
-            } catch (Exception $e) {
+            }
+            catch (Exception $e) {
                 $this->fallback = true;
             }
 
@@ -138,8 +139,7 @@ 
      * @param CacheItemInterface $item
      * @return null|array
      */
-    protected function driverRead(CacheItemInterface $item)
-    {
+    protected function driverRead(CacheItemInterface $item) {
         $val = $this->instance->get($item->getKey());
 
         if ($val === false) {