PHPSocialNetwork / phpfastcache

src/phpFastCache/Core/PathSeekerTrait.php

Doc Comments +2 added lines, -3 removed lines

@@ -20,7 +20,6 @@ 
 trait PathSeekerTrait
 {
     /**
-     * @param bool $skip_create_path
      * @param $config
      * @return string
      * @throws \Exception
@@ -155,7 +154,7 @@ 
 
     /**
      * @param $filename
-     * @return mixed
+     * @return string
      */
     protected static function cleanFileName($filename)
     {
@@ -170,7 +169,7 @@ 
     }
 
     /**
-     * @param $path
+     * @param string $path
      * @param bool $create
      * @throws \Exception
      */

Indentation +4 added lines, -4 removed lines

@@ -160,9 +160,9 @@ 
     protected static function cleanFileName($filename)
     {
         $regex = [
-          '/[\?\[\]\/\\\=\<\>\:\;\,\'\"\&\$\#\*\(\)\|\~\`\!\{\}]/',
-          '/\.$/',
-          '/^\./',
+            '/[\?\[\]\/\\\=\<\>\:\;\,\'\"\&\$\#\*\(\)\|\~\`\!\{\}]/',
+            '/\.$/',
+            '/^\./',
         ];
         $replace = ['-', '', ''];
 
@@ -182,7 +182,7 @@ 
                     chmod($path, 0777);
                 } catch (phpFastCacheDriverException $e) {
                     throw new phpFastCacheDriverException('PLEASE CHMOD ' . $path . ' - 0777 OR ANY WRITABLE PERMISSION!',
-                      92);
+                        92);
                 }
             }
 

Spacing +14 added lines, -14 removed lines

@@ -29,27 +29,27 @@ 
     {
         $tmp_dir = ini_get('upload_tmp_dir') ? ini_get('upload_tmp_dir') : sys_get_temp_dir();
 
-        if (!isset($this->config[ 'path' ]) || $this->config[ 'path' ] == '') {
+        if (!isset($this->config['path']) || $this->config['path'] == '') {
             if (self::isPHPModule()) {
                 $path = $tmp_dir;
             } else {
-                $document_root_path = rtrim($_SERVER[ 'DOCUMENT_ROOT' ], '/') . '/../';
-                $path = isset($_SERVER[ 'DOCUMENT_ROOT' ]) && is_writable($document_root_path) ? $document_root_path : rtrim(__DIR__, '/') . '/';
+                $document_root_path = rtrim($_SERVER['DOCUMENT_ROOT'], '/') . '/../';
+                $path = isset($_SERVER['DOCUMENT_ROOT']) && is_writable($document_root_path) ? $document_root_path : rtrim(__DIR__, '/') . '/';
             }
 
-            if ($this->config[ 'path' ] != '') {
-                $path = $this->config[ 'path' ];
+            if ($this->config['path'] != '') {
+                $path = $this->config['path'];
             }
 
         } else {
-            $path = $this->config[ 'path' ];
+            $path = $this->config['path'];
         }
 
-        $securityKey = array_key_exists('securityKey', $this->config) ? $this->config[ 'securityKey' ] : '';
+        $securityKey = array_key_exists('securityKey', $this->config) ? $this->config['securityKey'] : '';
         if ($securityKey == "" || $securityKey == 'auto') {
-            $securityKey = $this->config[ 'securityKey' ];
+            $securityKey = $this->config['securityKey'];
             if ($securityKey == 'auto' || $securityKey == '') {
-                $securityKey = isset($_SERVER[ 'HTTP_HOST' ]) ? preg_replace('/^www./', '', strtolower($_SERVER[ 'HTTP_HOST' ])) : "default";
+                $securityKey = isset($_SERVER['HTTP_HOST']) ? preg_replace('/^www./', '', strtolower($_SERVER['HTTP_HOST'])) : "default";
             }
         }
         if ($securityKey != '') {
@@ -62,7 +62,7 @@ 
         $full_pathx = md5($full_path);
 
 
-        if (!isset($this->tmp[ $full_pathx ])) {
+        if (!isset($this->tmp[$full_pathx])) {
 
             if (!@file_exists($full_path) || !@is_writable($full_path)) {
                 if (!@file_exists($full_path)) {
@@ -86,8 +86,8 @@ 
                 }
             }
 
-            $this->tmp[ $full_pathx ] = true;
-            $this->htaccessGen($full_path, array_key_exists('htaccess', $this->config) ? $this->config[ 'htaccess' ] : false);
+            $this->tmp[$full_pathx] = true;
+            $this->htaccessGen($full_path, array_key_exists('htaccess', $this->config) ? $this->config['htaccess'] : false);
         }
 
         return realpath($full_path);
@@ -146,10 +146,10 @@ 
      */
     public function setChmodAuto()
     {
-        if (!isset($this->config[ 'default_chmod' ]) || $this->config[ 'default_chmod' ] == '' || is_null($this->config[ 'default_chmod' ])) {
+        if (!isset($this->config['default_chmod']) || $this->config['default_chmod'] == '' || is_null($this->config['default_chmod'])) {
             return 0777;
         } else {
-            return $this->config[ 'default_chmod' ];
+            return $this->config['default_chmod'];
         }
     }
 

src/phpFastCache/Core/StandardPsr6StructureTrait.php

Doc Comments +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
 
     /**
      * @param \Psr\Cache\CacheItemInterface $item
-     * @return mixed
+     * @return boolean
      * @throws \InvalidArgumentException
      */
     public function save(CacheItemInterface $item)
@@ -175,7 +175,7 @@ 
     }
 
     /**
-     * @return mixed|null
+     * @return boolean
      * @throws \InvalidArgumentException
      */
     public function commit()

Spacing +5 added lines, -5 removed lines

@@ -71,7 +71,7 @@ 
             throw new \InvalidArgumentException(sprintf('$key must be a string, got type "%s" instead.', gettype($key)));
         }
 
-        return $this->itemInstances[ $key ];
+        return $this->itemInstances[$key];
     }
 
     /**
@@ -82,7 +82,7 @@ 
     public function setItem(CacheItemInterface $item)
     {
         if ($this->getClassNamespace() . '\\Item' === get_class($item)) {
-            $this->itemInstances[ $item->getKey() ] = $item;
+            $this->itemInstances[$item->getKey()] = $item;
 
             return $this;
         } else {
@@ -99,7 +99,7 @@ 
     {
         $collection = [];
         foreach ($keys as $key) {
-            $collection[ $key ] = $this->getItem($key);
+            $collection[$key] = $this->getItem($key);
         }
 
         return $collection;
@@ -171,7 +171,7 @@ 
      */
     public function saveDeferred(CacheItemInterface $item)
     {
-        return $this->deferredList[ $item->getKey() ] = $item;
+        return $this->deferredList[$item->getKey()] = $item;
     }
 
     /**
@@ -184,7 +184,7 @@ 
         foreach ($this->deferredList as $key => $item) {
             $result = $this->save($item);
             if ($return !== false) {
-                unset($this->deferredList[ $key ]);
+                unset($this->deferredList[$key]);
                 $return = $result;
             }
         }

src/phpFastCache/Drivers/Couchbase/Driver.php

Doc Comments +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
     }
 
     /**
-     * @return bool
+     * @return boolean|null
      */
     public function driverConnect()
     {

Indentation +2 added lines, -2 removed lines

@@ -142,10 +142,10 @@
             $password = isset($this->config[ 'password' ]) ? $this->config[ 'password' ] : '';
             $username = isset($this->config[ 'username' ]) ? $this->config[ 'username' ] : '';
             $buckets = isset($this->config[ 'buckets' ]) ? $this->config[ 'buckets' ] : [
-              [
+                [
                 'bucket' => 'default',
                 'password' => '',
-              ],
+                ],
             ];
 
             $this->instance = $this->instance ?: new CouchbaseClient("couchbase://{$host}", $username, $password);

Spacing +8 added lines, -8 removed lines

@@ -137,11 +137,11 @@ 
         } else {
 
 
-            $host = isset($this->config[ 'host' ]) ? $this->config[ 'host' ] : '127.0.0.1';
+            $host = isset($this->config['host']) ? $this->config['host'] : '127.0.0.1';
             //$port = isset($server[ 'port' ]) ? $server[ 'port' ] : '11211';
-            $password = isset($this->config[ 'password' ]) ? $this->config[ 'password' ] : '';
-            $username = isset($this->config[ 'username' ]) ? $this->config[ 'username' ] : '';
-            $buckets = isset($this->config[ 'buckets' ]) ? $this->config[ 'buckets' ] : [
+            $password = isset($this->config['password']) ? $this->config['password'] : '';
+            $username = isset($this->config['username']) ? $this->config['username'] : '';
+            $buckets = isset($this->config['buckets']) ? $this->config['buckets'] : [
               [
                 'bucket' => 'default',
                 'password' => '',
@@ -152,8 +152,8 @@ 
 
 
             foreach ($buckets as $bucket) {
-                $this->bucketCurrent = $this->bucketCurrent ?: $bucket[ 'bucket' ];
-                $this->setBucket($bucket[ 'bucket' ], $this->instance->openBucket($bucket[ 'bucket' ], $bucket[ 'password' ]));
+                $this->bucketCurrent = $this->bucketCurrent ?: $bucket['bucket'];
+                $this->setBucket($bucket['bucket'], $this->instance->openBucket($bucket['bucket'], $bucket['password']));
             }
         }
     }
@@ -163,7 +163,7 @@ 
      */
     protected function getBucket()
     {
-        return $this->bucketInstances[ $this->bucketCurrent ];
+        return $this->bucketInstances[$this->bucketCurrent];
     }
 
     /**
@@ -174,7 +174,7 @@ 
     protected function setBucket($bucketName, \CouchbaseBucket $CouchbaseBucket)
     {
         if (!array_key_exists($bucketName, $this->bucketInstances)) {
-            $this->bucketInstances[ $bucketName ] = $CouchbaseBucket;
+            $this->bucketInstances[$bucketName] = $CouchbaseBucket;
         } else {
             throw new \LogicException('A bucket instance with this name already exists.');
         }

src/phpFastCache/Drivers/Devnull/Driver.php

Doc Comments +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 
     /**
      * @param \Psr\Cache\CacheItemInterface $item
-     * @return mixed
+     * @return boolean
      * @throws \InvalidArgumentException
      */
     public function driverWrite(CacheItemInterface $item)
@@ -112,7 +112,7 @@ 
 
     /**
      * @param \Psr\Cache\CacheItemInterface $item
-     * @return bool
+     * @return boolean|null
      * @throws \InvalidArgumentException
      */
     public function driverIsHit(CacheItemInterface $item)

Indentation +2 added lines, -2 removed lines

@@ -140,8 +140,8 @@
     {
         $stat = new driverStatistic();
         $stat->setInfo('A void info string')
-          ->setSize(1337)
-          ->setData('A void data string');
+            ->setSize(1337)
+            ->setData('A void data string');
 
         return $stat;
     }

src/phpFastCache/Drivers/Devtrue/Driver.php

Doc Comments +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 
     /**
      * @param \Psr\Cache\CacheItemInterface $item
-     * @return mixed
+     * @return boolean
      * @throws \InvalidArgumentException
      */
     public function driverWrite(CacheItemInterface $item)
@@ -70,7 +70,7 @@ 
 
     /**
      * @param $key
-     * @return mixed
+     * @return boolean
      */
     public function driverRead($key)
     {

Indentation +2 added lines, -2 removed lines

@@ -140,8 +140,8 @@
     {
         $stat = new driverStatistic();
         $stat->setInfo('A void info string')
-          ->setSize(1337)
-          ->setData('A void data string');
+            ->setSize(1337)
+            ->setData('A void data string');
 
         return $stat;
     }

src/phpFastCache/Drivers/Files/Driver.php

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 
 namespace phpFastCache\Drivers\Files;
 
-use phpFastCache\Cache\ExtendedCacheItemInterface;
 use phpFastCache\Core\DriverAbstract;
 use phpFastCache\Core\PathSeekerTrait;
 use phpFastCache\Core\StandardPsr6StructureTrait;

Indentation +5 added lines, -5 removed lines

@@ -253,8 +253,8 @@ 
                             $key = $key[ 0 ];
                         }
                         $content[ $key ] = [
-                          'size' => $size,
-                          'write_time' => (isset($object[ 'write_time' ]) ? $object[ 'write_time' ] : null),
+                            'size' => $size,
+                            'write_time' => (isset($object[ 'write_time' ]) ? $object[ 'write_time' ] : null),
                         ];
                         if ($object->isExpired()) {
                             @unlink($file_path);
@@ -267,11 +267,11 @@ 
         }
 
         $stat->setData($content)
-          ->setSize($total - $removed)
-          ->setInfo('Total [bytes]: ' . $total . ', '
+            ->setSize($total - $removed)
+            ->setInfo('Total [bytes]: ' . $total . ', '
             . 'Expired and removed [bytes]: ' . $removed . ', '
             . 'Current [bytes], ' . $total - $removed
-          );
+            );
 
         return $stat;
     }

Doc Comments +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
 
     /**
      * @param \Psr\Cache\CacheItemInterface $item
-     * @return mixed
+     * @return boolean|null
      * @throws \InvalidArgumentException
      */
     public function driverWrite(CacheItemInterface $item)
@@ -211,7 +211,7 @@ 
     /**
      * @param string $optionName
      * @param mixed $optionValue
-     * @return bool
+     * @return boolean|null
      * @throws \InvalidArgumentException
      */
     public static function isValidOption($optionName, $optionValue)
@@ -239,7 +239,7 @@ 
         }
     }
     /**
-     * @return array
+     * @return string[]
      */
     public static function getValidOptions()
     {
@@ -247,7 +247,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function getRequiredOptions()
     {

Spacing +5 added lines, -5 removed lines

@@ -71,7 +71,7 @@ 
             /*
              * Skip if Existing Caching in Options
              */
-            if (isset($option[ 'skipExisting' ]) && $option[ 'skipExisting' ] == true && file_exists($file_path)) {
+            if (isset($option['skipExisting']) && $option['skipExisting'] == true && file_exists($file_path)) {
                 $content = $this->readfile($file_path);
                 $old = $this->decode($content);
                 $toWrite = false;
@@ -217,7 +217,7 @@ 
     public static function isValidOption($optionName, $optionValue)
     {
         parent::isValidOption($optionName, $optionValue);
-        switch($optionName)
+        switch ($optionName)
         {
             case 'path':
                 return is_string($optionValue);
@@ -294,11 +294,11 @@ 
                         if (strpos($subdirFile, '.') === false) {
                             $key = $subdirFile;
                         } else {
-                            $key = explode('.', $subdirFile)[ 0 ];
+                            $key = explode('.', $subdirFile)[0];
                         }
-                        $content[ $key ] = [
+                        $content[$key] = [
                           'size' => $size,
-                          'write_time' => (isset($object[ 'write_time' ]) ? $object[ 'write_time' ] : null),
+                          'write_time' => (isset($object['write_time']) ? $object['write_time'] : null),
                         ];
                         if ($object->isExpired()) {
                             @unlink($file_path);

src/phpFastCache/Drivers/Memcached/Driver.php

Doc Comments +2 added lines, -2 removed lines

@@ -128,7 +128,7 @@ 
     }
 
     /**
-     * @return bool
+     * @return boolean|null
      */
     public function driverConnect()
     {
@@ -294,7 +294,7 @@ 
     }
 
     /**
-     * @return mixed|null
+     * @return boolean
      * @throws \InvalidArgumentException
      */
     public function commit()

Indentation +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
         $servers = (!empty($this->config[ 'memcache' ]) && is_array($this->config[ 'memcache' ]) ? $this->config[ 'memcache' ] : []);
         if (count($servers) < 1) {
             $servers = [
-              ['127.0.0.1', 11211],
+                ['127.0.0.1', 11211],
             ];
         }
 
@@ -186,7 +186,7 @@ 
             }
         } else {
             throw new \InvalidArgumentException(sprintf('$key must be a string, got type "%s" instead.',
-              gettype($key)));
+                gettype($key)));
         }
 
         return $this->itemInstances[ $key ];
@@ -205,7 +205,7 @@ 
             return $this;
         } else {
             throw new \InvalidArgumentException(sprintf('Invalid Item Class "%s" for this driver.',
-              get_class($item)));
+                get_class($item)));
         }
     }
 

Spacing +7 added lines, -7 removed lines

@@ -132,7 +132,7 @@ 
      */
     public function driverConnect()
     {
-        $servers = (!empty($this->config[ 'memcache' ]) && is_array($this->config[ 'memcache' ]) ? $this->config[ 'memcache' ] : []);
+        $servers = (!empty($this->config['memcache']) && is_array($this->config['memcache']) ? $this->config['memcache'] : []);
         if (count($servers) < 1) {
             $servers = [
               ['127.0.0.1', 11211],
@@ -141,7 +141,7 @@ 
 
         foreach ($servers as $server) {
             try {
-                if (!$this->instance->addServer($server[ 0 ], $server[ 1 ])) {
+                if (!$this->instance->addServer($server[0], $server[1])) {
                     $this->fallback = true;
                 }
             } catch (\Exception $e) {
@@ -189,7 +189,7 @@ 
               gettype($key)));
         }
 
-        return $this->itemInstances[ $key ];
+        return $this->itemInstances[$key];
     }
 
     /**
@@ -200,7 +200,7 @@ 
     public function setItem(CacheItemInterface $item)
     {
         if (__NAMESPACE__ . '\\Item' === get_class($item)) {
-            $this->itemInstances[ $item->getKey() ] = $item;
+            $this->itemInstances[$item->getKey()] = $item;
 
             return $this;
         } else {
@@ -218,7 +218,7 @@ 
     {
         $collection = [];
         foreach ($keys as $key) {
-            $collection[ $key ] = $this->getItem($key);
+            $collection[$key] = $this->getItem($key);
         }
 
         return $collection;
@@ -290,7 +290,7 @@ 
      */
     public function saveDeferred(CacheItemInterface $item)
     {
-        return $this->deferredList[ $item->getKey() ] = $item;
+        return $this->deferredList[$item->getKey()] = $item;
     }
 
     /**
@@ -303,7 +303,7 @@ 
         foreach ($this->deferredList as $key => $item) {
             $result = $this->driverWrite($item);
             if ($return !== false) {
-                unset($this->deferredList[ $key ]);
+                unset($this->deferredList[$key]);
                 $return = $result;
             }
         }

src/phpFastCache/Drivers/Mongodb/Driver.php

Doc Comments +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 
     /**
      * @param \Psr\Cache\CacheItemInterface $item
-     * @return mixed
+     * @return boolean
      * @throws \InvalidArgumentException
      */
     public function driverWrite(CacheItemInterface $item)
@@ -142,7 +142,7 @@ 
     }
 
     /**
-     * @return bool
+     * @return boolean|null
      * @throws MongoConnectionException
      * @throws LogicException
      */
@@ -181,7 +181,7 @@ 
 
     /**
      * @param \Psr\Cache\CacheItemInterface $item
-     * @return bool
+     * @return boolean|null
      * @throws \InvalidArgumentException
      */
     public function driverIsHit(CacheItemInterface $item)

Indentation +22 added lines, -22 removed lines

@@ -78,14 +78,14 @@ 
         if ($item instanceof Item) {
             try {
                 $result = (array) $this->getCollection()->update(
-                  ['_id' => $item->getKey()],
-                  [
+                    ['_id' => $item->getKey()],
+                    [
                     '$set' => [
-                      self::DRIVER_TIME_WRAPPER_INDEX => ($item->getTtl() > 0 ? new MongoDate(time() + $item->getTtl()) : null),
-                      self::DRIVER_DATA_WRAPPER_INDEX => new MongoBinData($this->encode($item->get()), MongoBinData::BYTE_ARRAY),
+                        self::DRIVER_TIME_WRAPPER_INDEX => ($item->getTtl() > 0 ? new MongoDate(time() + $item->getTtl()) : null),
+                        self::DRIVER_DATA_WRAPPER_INDEX => new MongoBinData($this->encode($item->get()), MongoBinData::BYTE_ARRAY),
                     ],
-                  ],
-                  ['upsert' => true, 'multiple' => false]
+                    ],
+                    ['upsert' => true, 'multiple' => false]
                 );
             } catch (MongoCursorException $e) {
                 return false;
@@ -106,8 +106,8 @@ 
         $document = $this->getCollection()->findOne(['_id' => $key], [self::DRIVER_DATA_WRAPPER_INDEX, self::DRIVER_TIME_WRAPPER_INDEX  /*'d', 'e'*/]);
         if ($document) {
             return [
-              self::DRIVER_DATA_WRAPPER_INDEX => $this->decode($document[ self::DRIVER_DATA_WRAPPER_INDEX ]->bin),
-              self::DRIVER_TIME_WRAPPER_INDEX => (new \DateTime())->setTimestamp($document[ self::DRIVER_TIME_WRAPPER_INDEX ]->sec),
+                self::DRIVER_DATA_WRAPPER_INDEX => $this->decode($document[ self::DRIVER_DATA_WRAPPER_INDEX ]->bin),
+                self::DRIVER_TIME_WRAPPER_INDEX => (new \DateTime())->setTimestamp($document[ self::DRIVER_TIME_WRAPPER_INDEX ]->sec),
             ];
         } else {
             return null;
@@ -162,10 +162,10 @@ 
              * @todo make an url builder
              */
             $this->instance = $this->instance ?: (new MongodbClient('mongodb://' .
-              ($username ?: '') .
-              ($password ? ":{$password}" : '') .
-              ($username ? '@' : '') . "{$host}" .
-              ($port != '27017' ? ":{$port}" : ''), ['timeout' => $timeout * 1000]))->phpFastCache;
+                ($username ?: '') .
+                ($password ? ":{$password}" : '') .
+                ($username ? '@' : '') . "{$host}" .
+                ($port != '27017' ? ":{$port}" : ''), ['timeout' => $timeout * 1000]))->phpFastCache;
             $this->instance->Cache->createIndex([self::DRIVER_TIME_WRAPPER_INDEX => 1], ['expireAfterSeconds' => 0]);
         }
     }
@@ -206,23 +206,23 @@ 
     public function getStats()
     {
         $serverStatus = $this->getCollection()->db->command([
-          'serverStatus' => 1,
-          'recordStats' => 0,
-          'repl' => 0,
-          'metrics' => 0,
+            'serverStatus' => 1,
+            'recordStats' => 0,
+            'repl' => 0,
+            'metrics' => 0,
         ]);
         $collStats = $this->getCollection()->db->command([
-          'collStats' => 'Cache',
-          'verbose' => true,
+            'collStats' => 'Cache',
+            'verbose' => true,
         ]);
 
         $stats = (new driverStatistic())
-          ->setInfo('MongoDB version ' . $serverStatus[ 'version' ] . ', Uptime (in days): ' . round($serverStatus[ 'uptime' ] / 86400, 1))
-          ->setSize((int) $collStats[ 'size' ])
-          ->setRawData([
+            ->setInfo('MongoDB version ' . $serverStatus[ 'version' ] . ', Uptime (in days): ' . round($serverStatus[ 'uptime' ] / 86400, 1))
+            ->setSize((int) $collStats[ 'size' ])
+            ->setRawData([
             'serverStatus' => $serverStatus,
             'collStats' => $collStats,
-          ]);
+            ]);
 
         return $stats;
     }

Spacing +12 added lines, -12 removed lines

@@ -91,7 +91,7 @@ 
                 return false;
             }
 
-            return isset($result[ 'ok' ]) ? $result[ 'ok' ] == 1 : true;
+            return isset($result['ok']) ? $result['ok'] == 1 : true;
         } else {
             throw new \InvalidArgumentException('Cross-Driver type confusion detected');
         }
@@ -106,8 +106,8 @@ 
         $document = $this->getCollection()->findOne(['_id' => $key], [self::DRIVER_DATA_WRAPPER_INDEX, self::DRIVER_TIME_WRAPPER_INDEX  /*'d', 'e'*/]);
         if ($document) {
             return [
-              self::DRIVER_DATA_WRAPPER_INDEX => $this->decode($document[ self::DRIVER_DATA_WRAPPER_INDEX ]->bin),
-              self::DRIVER_TIME_WRAPPER_INDEX => (new \DateTime())->setTimestamp($document[ self::DRIVER_TIME_WRAPPER_INDEX ]->sec),
+              self::DRIVER_DATA_WRAPPER_INDEX => $this->decode($document[self::DRIVER_DATA_WRAPPER_INDEX]->bin),
+              self::DRIVER_TIME_WRAPPER_INDEX => (new \DateTime())->setTimestamp($document[self::DRIVER_TIME_WRAPPER_INDEX]->sec),
             ];
         } else {
             return null;
@@ -127,7 +127,7 @@ 
         if ($item instanceof Item) {
             $deletionResult = (array) $this->getCollection()->remove(['_id' => $item->getKey()], ["w" => 1]);
 
-            return (int) $deletionResult[ 'ok' ] === 1 && !$deletionResult[ 'err' ];
+            return (int) $deletionResult['ok'] === 1 && !$deletionResult['err'];
         } else {
             throw new \InvalidArgumentException('Cross-Driver type confusion detected');
         }
@@ -151,11 +151,11 @@ 
         if ($this->instance instanceof MongodbClient) {
             throw new LogicException('Already connected to Mongodb server');
         } else {
-            $host = isset($this->config[ 'host' ]) ? $this->config[ 'host' ] : '127.0.0.1';
-            $port = isset($server[ 'port' ]) ? $server[ 'port' ] : '27017';
-            $timeout = isset($server[ 'timeout' ]) ? $server[ 'timeout' ] : 3;
-            $password = isset($this->config[ 'password' ]) ? $this->config[ 'password' ] : '';
-            $username = isset($this->config[ 'username' ]) ? $this->config[ 'username' ] : '';
+            $host = isset($this->config['host']) ? $this->config['host'] : '127.0.0.1';
+            $port = isset($server['port']) ? $server['port'] : '27017';
+            $timeout = isset($server['timeout']) ? $server['timeout'] : 3;
+            $password = isset($this->config['password']) ? $this->config['password'] : '';
+            $username = isset($this->config['username']) ? $this->config['username'] : '';
 
 
             /**
@@ -188,7 +188,7 @@ 
     {
         $document = $this->getCollection()->findOne(['_id' => $item->getKey()], [self::DRIVER_TIME_WRAPPER_INDEX  /*'d', 'e'*/]);
         if ($document) {
-            return $document[ self::DRIVER_TIME_WRAPPER_INDEX ]->sec >= time();
+            return $document[self::DRIVER_TIME_WRAPPER_INDEX]->sec >= time();
         } else {
             return null;
         }
@@ -217,8 +217,8 @@ 
         ]);
 
         $stats = (new driverStatistic())
-          ->setInfo('MongoDB version ' . $serverStatus[ 'version' ] . ', Uptime (in days): ' . round($serverStatus[ 'uptime' ] / 86400, 1))
-          ->setSize((int) $collStats[ 'size' ])
+          ->setInfo('MongoDB version ' . $serverStatus['version'] . ', Uptime (in days): ' . round($serverStatus['uptime'] / 86400, 1))
+          ->setSize((int) $collStats['size'])
           ->setRawData([
             'serverStatus' => $serverStatus,
             'collStats' => $collStats,

src/phpFastCache/Drivers/Sqlite/Driver.php

Doc Comments +3 added lines, -3 removed lines

@@ -211,7 +211,7 @@ 
     }
 
     /**
-     * @param $keyword
+     * @param string $keyword
      * @param bool $reset
      * @return PDO
      */
@@ -248,7 +248,7 @@ 
 
     /**
      * @param \Psr\Cache\CacheItemInterface $item
-     * @return mixed
+     * @return boolean
      * @throws \InvalidArgumentException
      */
     public function driverWrite(CacheItemInterface $item)
@@ -399,7 +399,7 @@ 
     }
 
     /**
-     * @return bool
+     * @return boolean|null
      */
     public function driverConnect()
     {

Spacing +13 added lines, -13 removed lines

@@ -166,12 +166,12 @@ 
             $stm = $this->indexing->prepare("SELECT MAX(`db`) as `db` FROM `balancing`");
             $stm->execute();
             $row = $stm->fetch(PDO::FETCH_ASSOC);
-            if (!isset($row[ 'db' ])) {
+            if (!isset($row['db'])) {
                 $db = 1;
-            } elseif ($row[ 'db' ] <= 1) {
+            } elseif ($row['db'] <= 1) {
                 $db = 1;
             } else {
-                $db = $row[ 'db' ];
+                $db = $row['db'];
             }
 
             // check file size
@@ -193,8 +193,8 @@ 
           ':keyword' => $keyword,
         ]);
         $row = $stm->fetch(PDO::FETCH_ASSOC);
-        if (isset($row[ 'db' ]) && $row[ 'db' ] != '') {
-            $db = $row[ 'db' ];
+        if (isset($row['db']) && $row['db'] != '') {
+            $db = $row['db'];
         } else {
             /*
              * Insert new to Indexing
@@ -225,7 +225,7 @@ 
         /**
          * init instant
          */
-        if (!isset($this->instance[ $instant ])) {
+        if (!isset($this->instance[$instant])) {
             // check DB Files ready or not
             $createTable = false;
             if (!file_exists($this->SqliteDir . '/db' . $instant) || $reset == true) {
@@ -238,12 +238,12 @@ 
                 $this->initDB($PDO);
             }
 
-            $this->instance[ $instant ] = $PDO;
+            $this->instance[$instant] = $PDO;
             unset($PDO);
 
         }
 
-        return $this->instance[ $instant ];
+        return $this->instance[$instant];
     }
 
     /**
@@ -257,7 +257,7 @@ 
          * Check for Cross-Driver type confusion
          */
         if ($item instanceof Item) {
-            $skipExisting = isset($this->config[ 'skipExisting' ]) ? $this->config[ 'skipExisting' ] : false;
+            $skipExisting = isset($this->config['skipExisting']) ? $this->config['skipExisting'] : false;
             $toWrite = true;
 
             // check in cache first
@@ -333,18 +333,18 @@ 
             }
         }
 
-        if (isset($row[ 'id' ])) {
+        if (isset($row['id'])) {
             /**
              * @var $item ExtendedCacheItemInterface
              */
-            $item = $this->decode($row[ 'object' ]);
+            $item = $this->decode($row['object']);
             if ($item instanceof ExtendedCacheItemInterface && $item->isExpired()) {
                 $this->driverDelete($item);
 
                 return null;
             }
 
-            return $this->decode($row[ 'object' ]);
+            return $this->decode($row['object']);
         }
 
         return null;
@@ -434,7 +434,7 @@ 
               ':U' => time(),
             ]);
             $data = $stm->fetch(PDO::FETCH_ASSOC);
-            if ($data[ 'total' ] >= 1) {
+            if ($data['total'] >= 1) {
                 return true;
             } else {
                 return false;

Indentation +29 added lines, -29 removed lines

@@ -150,7 +150,7 @@ 
 
             $PDO = new PDO("sqlite:" . $this->SqliteDir . '/' . self::INDEXING_FILE);
             $PDO->setAttribute(PDO::ATTR_ERRMODE,
-              PDO::ERRMODE_EXCEPTION);
+                PDO::ERRMODE_EXCEPTION);
 
             if ($createTable == true) {
                 $this->initIndexing($PDO);
@@ -185,7 +185,7 @@ 
         // look for keyword
         $stm = $this->indexing->prepare("SELECT * FROM `balancing` WHERE `keyword`=:keyword LIMIT 1");
         $stm->execute([
-          ':keyword' => $keyword,
+            ':keyword' => $keyword,
         ]);
         $row = $stm->fetch(PDO::FETCH_ASSOC);
         if (isset($row[ 'db' ]) && $row[ 'db' ] != '') {
@@ -197,8 +197,8 @@ 
             $db = $this->currentDB;
             $stm = $this->indexing->prepare("INSERT INTO `balancing` (`keyword`,`db`) VALUES(:keyword, :db)");
             $stm->execute([
-              ':keyword' => $keyword,
-              ':db' => $db,
+                ':keyword' => $keyword,
+                ':db' => $db,
             ]);
         }
 
@@ -269,11 +269,11 @@ 
             if ($toWrite == true) {
                 try {
                     $stm = $this->getDb($item->getKey())
-                      ->prepare("INSERT OR REPLACE INTO `caching` (`keyword`,`object`,`exp`) values(:keyword,:object,:exp)");
+                        ->prepare("INSERT OR REPLACE INTO `caching` (`keyword`,`object`,`exp`) values(:keyword,:object,:exp)");
                     $stm->execute([
-                      ':keyword' => $item->getKey(),
-                      ':object' => $this->encode($this->driverPreWrap($item)),
-                      ':exp' => time() + $item->getTtl(),
+                        ':keyword' => $item->getKey(),
+                        ':object' => $this->encode($this->driverPreWrap($item)),
+                        ':exp' => time() + $item->getTtl(),
                     ]);
 
                     return true;
@@ -281,11 +281,11 @@ 
 
                     try {
                         $stm = $this->getDb($item->getKey(), true)
-                          ->prepare("INSERT OR REPLACE INTO `caching` (`keyword`,`object`,`exp`) values(:keyword,:object,:exp)");
+                            ->prepare("INSERT OR REPLACE INTO `caching` (`keyword`,`object`,`exp`) values(:keyword,:object,:exp)");
                         $stm->execute([
-                          ':keyword' => $item->getKey(),
-                          ':object' => $this->encode($this->driverPreWrap($item)),
-                          ':exp' => time() + $item->getTtl(),
+                            ':keyword' => $item->getKey(),
+                            ':object' => $this->encode($this->driverPreWrap($item)),
+                            ':exp' => time() + $item->getTtl(),
                         ]);
                     } catch (PDOException $e) {
                         return false;
@@ -307,20 +307,20 @@ 
     {
         try {
             $stm = $this->getDb($key)
-              ->prepare("SELECT * FROM `caching` WHERE `keyword`=:keyword AND (`exp` >= :U)  LIMIT 1");
+                ->prepare("SELECT * FROM `caching` WHERE `keyword`=:keyword AND (`exp` >= :U)  LIMIT 1");
             $stm->execute([
-              ':keyword' => $key,
-              ':U' => time(),
+                ':keyword' => $key,
+                ':U' => time(),
             ]);
             $row = $stm->fetch(PDO::FETCH_ASSOC);
 
         } catch (PDOException $e) {
             try {
                 $stm = $this->getDb($key, true)
-                  ->prepare("SELECT * FROM `caching` WHERE `keyword`=:keyword AND (`exp` >= :U)  LIMIT 1");
+                    ->prepare("SELECT * FROM `caching` WHERE `keyword`=:keyword AND (`exp` >= :U)  LIMIT 1");
                 $stm->execute([
-                  ':keyword' => $key,
-                  ':U' => time(),
+                    ':keyword' => $key,
+                    ':U' => time(),
                 ]);
                 $row = $stm->fetch(PDO::FETCH_ASSOC);
             } catch (PDOException $e) {
@@ -358,13 +358,13 @@ 
         if ($item instanceof Item) {
             try {
                 $stm = $this->getDb($item->getKey())
-                  //->prepare("DELETE FROM `caching` WHERE (`id`=:id) OR (`exp` <= :U) ");
-                  ->prepare("DELETE FROM `caching` WHERE (`exp` <= :U) OR (`keyword`=:keyword) ");
+                    //->prepare("DELETE FROM `caching` WHERE (`id`=:id) OR (`exp` <= :U) ");
+                    ->prepare("DELETE FROM `caching` WHERE (`exp` <= :U) OR (`keyword`=:keyword) ");
 
                 return $stm->execute([
                     // ':id' => $row[ 'id' ],
-                  ':keyword' => $item->getKey(),
-                  ':U' => time(),
+                    ':keyword' => $item->getKey(),
+                    ':U' => time(),
                 ]);
             } catch (PDOException $e) {
                 return false;
@@ -422,10 +422,10 @@ 
              * @todo: Check expiration time here
              */
             $stm = $this->getDb($item->getKey())
-              ->prepare("SELECT COUNT(`id`) as `total` FROM `caching` WHERE (`keyword`=:keyword) AND (`exp` <= :U) ");
+                ->prepare("SELECT COUNT(`id`) as `total` FROM `caching` WHERE (`keyword`=:keyword) AND (`exp` <= :U) ");
             $stm->execute([
-              ':keyword' => $item->getKey(),
-              ':U' => time(),
+                ':keyword' => $item->getKey(),
+                ':U' => time(),
             ]);
             $data = $stm->fetch(PDO::FETCH_ASSOC);
             if ($data[ 'total' ] >= 1) {
@@ -464,11 +464,11 @@ 
                 try {
                     $PDO = new PDO("sqlite:" . $file_path);
                     $PDO->setAttribute(PDO::ATTR_ERRMODE,
-                      PDO::ERRMODE_EXCEPTION);
+                        PDO::ERRMODE_EXCEPTION);
 
                     $stm = $PDO->prepare("DELETE FROM `caching` WHERE `exp` <= :U");
                     $stm->execute([
-                      ':U' => date('U'),
+                        ':U' => date('U'),
                     ]);
 
                     $PDO->exec('VACUUM;');
@@ -482,9 +482,9 @@ 
         }
 
         $stat->setSize($optimized)
-          ->setInfo('Total before removing expired entries [bytes]: ' . $total . ', '
+            ->setInfo('Total before removing expired entries [bytes]: ' . $total . ', '
             . 'Optimized after removing expired entries [bytes]: ' . $optimized
-          );
+            );
 
         return $stat;
     }