PHPSocialNetwork / phpfastcache

src/phpFastCache/Drivers/Predis/Driver.php

Indentation +8 added lines, -8 removed lines

@@ -126,10 +126,10 @@ 
         $config = isset($this->config[ 'predis' ]) ? $this->config[ 'predis' ] : [];
 
         $this->instance = new PredisClient(array_merge([
-          'host' => '127.0.0.1',
-          'port' => 6379,
-          'password' => null,
-          'database' => null,
+            'host' => '127.0.0.1',
+            'port' => 6379,
+            'password' => null,
+            'database' => null,
         ], $config));
 
         return true;
@@ -152,9 +152,9 @@ 
         $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($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)));
+            ->setData(implode(', ', array_keys($this->itemInstances)))
+            ->setRawData($info)
+            ->setSize($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)));
     }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -123,7 +123,7 @@ 
      */
     protected function driverConnect()
     {
-        $config = isset($this->config[ 'predis' ]) ? $this->config[ 'predis' ] : [];
+        $config = isset($this->config['predis']) ? $this->config['predis'] : [];
 
         $this->instance = new PredisClient(array_merge([
           'host' => '127.0.0.1',
@@ -149,7 +149,7 @@ 
         $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');
+        $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)))

src/phpFastCache/Drivers/Memcache/Driver.php

Indentation +6 added lines, -6 removed lines

@@ -132,12 +132,12 @@ 
         $servers = (!empty($this->config[ 'servers' ]) && is_array($this->config[ 'servers' ]) ? $this->config[ 'servers' ] : []);
         if (count($servers) < 1) {
             $servers = [
-              [
+                [
                 'host' =>'127.0.0.1',
                 'port' => 11211,
                 'sasl_user' => false,
                 'sasl_password' => false
-              ],
+                ],
             ];
         }
 
@@ -174,9 +174,9 @@ 
         $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($stats[ 'bytes' ]);
+            ->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($stats[ 'bytes' ]);
     }
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -53,7 +53,7 @@ 
         } else {
             $this->driverConnect();
 
-            if (array_key_exists('compress_data', $config) && $config[ 'compress_data' ] === true) {
+            if (array_key_exists('compress_data', $config) && $config['compress_data'] === true) {
                 $this->memcacheFlags = MEMCACHE_COMPRESSED;
             }
         }
@@ -130,7 +130,7 @@ 
     protected function driverConnect()
     {
         $this->instance = new MemcacheSoftware();
-        $servers = (!empty($this->config[ 'servers' ]) && is_array($this->config[ 'servers' ]) ? $this->config[ 'servers' ] : []);
+        $servers = (!empty($this->config['servers']) && is_array($this->config['servers']) ? $this->config['servers'] : []);
         if (count($servers) < 1) {
             $servers = [
               [
@@ -147,8 +147,8 @@ 
                 if (!$this->instance->addServer($server['host'], $server['port'])) {
                     $this->fallback = true;
                 }
-                if(!empty($server[ 'sasl_user' ]) && !empty($server[ 'sasl_password'])){
-                    $this->instance->setSaslAuthData($server[ 'sasl_user' ], $server[ 'sasl_password']);
+                if (!empty($server['sasl_user']) && !empty($server['sasl_password'])) {
+                    $this->instance->setSaslAuthData($server['sasl_user'], $server['sasl_password']);
                 }
             } catch (\Exception $e) {
                 $this->fallback = true;
@@ -168,16 +168,16 @@ 
     public function 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);
+        $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' ]);
+        $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)))
+          ->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($stats[ 'bytes' ]);
+          ->setSize($stats['bytes']);
     }
 }
\ No newline at end of file

src/phpFastCache/Drivers/Redis/Driver.php

Indentation +4 added lines, -4 removed lines

@@ -163,9 +163,9 @@
         $date = (new \DateTime())->setTimestamp(time() - $info[ 'uptime_in_seconds' ]);
 
         return (new DriverStatistic())
-          ->setData(implode(', ', array_keys($this->itemInstances)))
-          ->setRawData($info)
-          ->setSize($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)));
+            ->setData(implode(', ', array_keys($this->itemInstances)))
+            ->setRawData($info)
+            ->setSize($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)));
     }
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -126,11 +126,11 @@ 
         } else {
             $this->instance = $this->instance ?: new RedisClient();
 
-            $host = isset($this->config[ 'host' ]) ? $this->config[ 'host' ] : '127.0.0.1';
-            $port = isset($this->config[ 'port' ]) ? (int) $this->config[ 'port' ] : '6379';
-            $password = isset($this->config[ 'password' ]) ? $this->config[ 'password' ] : '';
-            $database = isset($this->config[ 'database' ]) ? $this->config[ 'database' ] : '';
-            $timeout = isset($this->config[ 'timeout' ]) ? $this->config[ 'timeout' ] : '';
+            $host = isset($this->config['host']) ? $this->config['host'] : '127.0.0.1';
+            $port = isset($this->config['port']) ? (int) $this->config['port'] : '6379';
+            $password = isset($this->config['password']) ? $this->config['password'] : '';
+            $database = isset($this->config['database']) ? $this->config['database'] : '';
+            $timeout = isset($this->config['timeout']) ? $this->config['timeout'] : '';
 
             if (!$this->instance->connect($host, (int) $port, (int) $timeout)) {
                 return false;
@@ -160,12 +160,12 @@ 
     {
         // used_memory
         $info = $this->instance->info();
-        $date = (new \DateTime())->setTimestamp(time() - $info[ 'uptime_in_seconds' ]);
+        $date = (new \DateTime())->setTimestamp(time() - $info['uptime_in_seconds']);
 
         return (new DriverStatistic())
           ->setData(implode(', ', array_keys($this->itemInstances)))
           ->setRawData($info)
-          ->setSize($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)));
+          ->setSize($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)));
     }
 }
\ No newline at end of file

src/phpFastCache/Drivers/Couchbase/Driver.php

Indentation +6 added lines, -6 removed lines

@@ -140,10 +140,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 = new CouchbaseClient("couchbase://{$host}", $username, $password);
@@ -193,9 +193,9 @@ 
         $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.");
+            ->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.");
     }
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -136,10 +136,10 @@ 
         } else {
 
 
-            $host = isset($this->config[ 'host' ]) ? $this->config[ 'host' ] : '127.0.0.1';
-            $password = isset($this->config[ 'password' ]) ? $this->config[ 'password' ] : '';
-            $username = isset($this->config[ 'username' ]) ? $this->config[ 'username' ] : '';
-            $buckets = isset($this->config[ 'buckets' ]) ? $this->config[ 'buckets' ] : [
+            $host = isset($this->config['host']) ? $this->config['host'] : '127.0.0.1';
+            $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' => '',
@@ -149,8 +149,8 @@ 
             $this->instance = new CouchbaseClient("couchbase://{$host}", $username, $password);
 
             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']));
             }
         }
 
@@ -162,7 +162,7 @@ 
      */
     protected function getBucket()
     {
-        return $this->bucketInstances[ $this->bucketCurrent ];
+        return $this->bucketInstances[$this->bucketCurrent];
     }
 
     /**
@@ -173,7 +173,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 phpFastCacheLogicException('A bucket instance with this name already exists.');
         }
@@ -193,9 +193,9 @@ 
         $info = $this->getBucket()->manager()->info();
 
         return (new DriverStatistic())
-          ->setSize($info[ 'basicStats' ][ 'diskUsed' ])
+          ->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.");
+          ->setInfo('CouchBase version ' . $info['nodes'][0]['version'] . ', Uptime (in days): ' . round($info['nodes'][0]['uptime'] / 86400, 1) . "\n For more information see RawData.");
     }
 }
\ No newline at end of file

src/phpFastCache/Drivers/Apcu/Driver.php

Indentation +4 added lines, -4 removed lines

@@ -137,9 +137,9 @@
         $date = (new \DateTime())->setTimestamp($stats[ 'start_time' ]);
 
         return (new DriverStatistic())
-          ->setData(implode(', ', array_keys($this->itemInstances)))
-          ->setInfo(sprintf("The APCU cache is up since %s, and have %d item(s) in cache.\n For more information see RawData.", $date->format(DATE_RFC2822), $stats[ 'num_entries' ]))
-          ->setRawData($stats)
-          ->setSize($stats[ 'mem_size' ]);
+            ->setData(implode(', ', array_keys($this->itemInstances)))
+            ->setInfo(sprintf("The APCU cache is up since %s, and have %d item(s) in cache.\n For more information see RawData.", $date->format(DATE_RFC2822), $stats[ 'num_entries' ]))
+            ->setRawData($stats)
+            ->setSize($stats[ 'mem_size' ]);
     }
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -134,12 +134,12 @@
     public function getStats()
     {
         $stats = (array) apcu_cache_info();
-        $date = (new \DateTime())->setTimestamp($stats[ 'start_time' ]);
+        $date = (new \DateTime())->setTimestamp($stats['start_time']);
 
         return (new DriverStatistic())
           ->setData(implode(', ', array_keys($this->itemInstances)))
-          ->setInfo(sprintf("The APCU cache is up since %s, and have %d item(s) in cache.\n For more information see RawData.", $date->format(DATE_RFC2822), $stats[ 'num_entries' ]))
+          ->setInfo(sprintf("The APCU cache is up since %s, and have %d item(s) in cache.\n For more information see RawData.", $date->format(DATE_RFC2822), $stats['num_entries']))
           ->setRawData($stats)
-          ->setSize($stats[ 'mem_size' ]);
+          ->setSize($stats['mem_size']);
     }
 }
\ No newline at end of file

src/phpFastCache/Drivers/Memcached/Driver.php

Indentation +6 added lines, -6 removed lines

@@ -132,12 +132,12 @@ 
         $servers = (!empty($this->config[ 'servers' ]) && is_array($this->config[ 'servers' ]) ? $this->config[ 'servers' ] : []);
         if (count($servers) < 1) {
             $servers = [
-              [
+                [
                 'host' =>'127.0.0.1',
                 'port' => 11211,
                 'sasl_user' => false,
                 'sasl_password' => false
-              ],
+                ],
             ];
         }
 
@@ -174,9 +174,9 @@ 
         $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($stats[ 'bytes' ]);
+            ->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($stats[ 'bytes' ]);
     }
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -128,7 +128,7 @@ 
     protected function driverConnect()
     {
         $this->instance = new MemcachedSoftware();
-        $servers = (!empty($this->config[ 'servers' ]) && is_array($this->config[ 'servers' ]) ? $this->config[ 'servers' ] : []);
+        $servers = (!empty($this->config['servers']) && is_array($this->config['servers']) ? $this->config['servers'] : []);
         if (count($servers) < 1) {
             $servers = [
               [
@@ -145,8 +145,8 @@ 
                 if (!$this->instance->addServer($server['host'], $server['port'])) {
                     $this->fallback = true;
                 }
-                if(!empty($server[ 'sasl_user' ]) && !empty($server[ 'sasl_password'])){
-                    $this->instance->setSaslAuthData($server[ 'sasl_user' ], $server[ 'sasl_password']);
+                if (!empty($server['sasl_user']) && !empty($server['sasl_password'])) {
+                    $this->instance->setSaslAuthData($server['sasl_user'], $server['sasl_password']);
                 }
             } catch (\Exception $e) {
                 $this->fallback = true;
@@ -166,16 +166,16 @@ 
     public function 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);
+        $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' ]);
+        $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)))
+          ->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($stats[ 'bytes' ]);
+          ->setSize($stats['bytes']);
     }
 }
\ No newline at end of file

src/phpFastCache/Helper/CacheConditionalHelper.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
     {
         $cacheItem = $this->cacheInstance->getItem($cacheKey);
 
-        if(!$cacheItem->isHit())
+        if (!$cacheItem->isHit())
         {
             $cacheItem->set($callback());
             $this->cacheInstance->save($cacheItem);

src/phpFastCache/Drivers/Couchdb/Driver.php

Doc Comments +2 added lines, -1 removed lines

@@ -60,7 +60,7 @@ 
 
     /**
      * @param \Psr\Cache\CacheItemInterface $item
-     * @return mixed
+     * @return boolean
      * @throws phpFastCacheDriverException
      * @throws phpFastCacheInvalidArgumentException
      */
@@ -187,6 +187,7 @@ 
     }
 
     /**
+     * @param string $docId
      * @return string|null
      */
     protected function getLatestDocumentRevision($docId)

Indentation +11 added lines, -11 removed lines

@@ -175,9 +175,9 @@ 
             $url .= $path;
 
             $this->instance = CouchDBClient::create([
-              'dbname' => $this->getDatabaseName(),
-              'url' => $url,
-              'timeout' => $timeout
+                'dbname' => $this->getDatabaseName(),
+                'url' => $url,
+                'timeout' => $timeout
             ]);
 
             $this->createDatabase();
@@ -194,10 +194,10 @@ 
         $path = '/' . $this->getDatabaseName() . '/' . urlencode($docId);
 
         $response = $this->instance->getHttpClient()->request(
-          'HEAD',
-          $path,
-          null,
-          false
+            'HEAD',
+            $path,
+            null,
+            false
         );
         if(!empty($response->headers['etag'])){
             return trim($response->headers['etag'], " '\"\t\n\r\0\x0B");
@@ -251,9 +251,9 @@ 
         $info = $this->instance->getDatabaseInfo();
 
         return (new DriverStatistic())
-          ->setSize($info['sizes']['active'])
-          ->setRawData($info)
-          ->setData(implode(', ', array_keys($this->itemInstances)))
-          ->setInfo('Couchdb version ' . $this->instance->getVersion() . "\n For more information see RawData.");
+            ->setSize($info['sizes']['active'])
+            ->setRawData($info)
+            ->setData(implode(', ', array_keys($this->itemInstances)))
+            ->setInfo('Couchdb version ' . $this->instance->getVersion() . "\n For more information see RawData.");
     }
 }
\ No newline at end of file

Spacing +23 added lines, -23 removed lines

@@ -70,9 +70,9 @@ 
          * Check for Cross-Driver type confusion
          */
         if ($item instanceof Item) {
-            try{
+            try {
                 $this->instance->putDocument(['data' => $this->encode($this->driverPreWrap($item))], $item->getEncodedKey(), $this->getLatestDocumentRevision($item->getEncodedKey()));
-            }catch (CouchDBException $e){
+            } catch (CouchDBException $e) {
                 throw new phpFastCacheDriverException('Got error while trying to upsert a document: ' . $e->getMessage(), null, $e);
             }
             return true;
@@ -88,17 +88,17 @@ 
      */
     protected function driverRead(CacheItemInterface $item)
     {
-        try{
+        try {
             $response = $this->instance->findDocument($item->getEncodedKey());
-        }catch (CouchDBException $e){
+        } catch (CouchDBException $e) {
             throw new phpFastCacheDriverException('Got error while trying to get a document: ' . $e->getMessage(), null, $e);
         }
 
-        if($response->status === 404 || empty($response->body['data'])){
+        if ($response->status === 404 || empty($response->body['data'])) {
             return null;
-        }else if($response->status === 200){
+        } else if ($response->status === 200) {
             return $this->decode($response->body['data']);
-        }else{
+        } else {
             throw new phpFastCacheDriverException('Got unexpected HTTP status: ' . $response->status);
         }
     }
@@ -115,9 +115,9 @@ 
          * Check for Cross-Driver type confusion
          */
         if ($item instanceof Item) {
-            try{
+            try {
                 $this->instance->deleteDocument($item->getEncodedKey(), $this->getLatestDocumentRevision($item->getEncodedKey()));
-            }catch (CouchDBException $e){
+            } catch (CouchDBException $e) {
                 throw new phpFastCacheDriverException('Got error while trying to delete a document: ' . $e->getMessage(), null, $e);
             }
             return true;
@@ -132,10 +132,10 @@ 
      */
     protected function driverClear()
     {
-        try{
+        try {
             $this->instance->deleteDatabase($this->getDatabaseName());
             $this->createDatabase();
-        }catch (CouchDBException $e){
+        } catch (CouchDBException $e) {
             throw new phpFastCacheDriverException('Got error while trying to delete and recreate the database: ' . $e->getMessage(), null, $e);
         }
 
@@ -152,19 +152,19 @@ 
         if ($this->instance instanceof CouchdbClient) {
             throw new phpFastCacheLogicException('Already connected to Couchdb server');
         } else {
-            $host = isset($this->config[ 'host' ]) ? $this->config[ 'host' ] : '127.0.0.1';
-            $ssl = isset($this->config[ 'ssl' ]) ? $this->config[ 'ssl' ] : false;
-            $port = isset($this->config[ 'port' ]) ? $this->config[ 'port' ] : 5984;
-            $path = isset($this->config[ 'path' ]) ? $this->config[ 'path' ] : '/';
-            $username = isset($this->config[ 'username' ]) ? $this->config[ 'username' ] : '';
-            $password = isset($this->config[ 'password' ]) ? $this->config[ 'password' ] : '';
-            $timeout = isset($this->config[ 'timeout' ]) ? $this->config[ 'timeout' ] : 10;
+            $host = isset($this->config['host']) ? $this->config['host'] : '127.0.0.1';
+            $ssl = isset($this->config['ssl']) ? $this->config['ssl'] : false;
+            $port = isset($this->config['port']) ? $this->config['port'] : 5984;
+            $path = isset($this->config['path']) ? $this->config['path'] : '/';
+            $username = isset($this->config['username']) ? $this->config['username'] : '';
+            $password = isset($this->config['password']) ? $this->config['password'] : '';
+            $timeout = isset($this->config['timeout']) ? $this->config['timeout'] : 10;
 
             $url = ($ssl ? 'https://' : 'http://');
-            if($username)
+            if ($username)
             {
                 $url .= "{$username}";
-                if($password)
+                if ($password)
                 {
                     $url .= ":{$password}";
                 }
@@ -199,7 +199,7 @@ 
           null,
           false
         );
-        if(!empty($response->headers['etag'])){
+        if (!empty($response->headers['etag'])) {
             return trim($response->headers['etag'], " '\"\t\n\r\0\x0B");
         }
 
@@ -211,7 +211,7 @@ 
      */
     protected function getDatabaseName()
     {
-        return isset($this->config[ 'database' ]) ? $this->config[ 'database' ] : 'phpfastcache';
+        return isset($this->config['database']) ? $this->config['database'] : 'phpfastcache';
     }
 
     /**
@@ -219,7 +219,7 @@ 
      */
     protected function createDatabase()
     {
-        if(!in_array($this->instance->getDatabase(), $this->instance->getAllDatabases(), true)){
+        if (!in_array($this->instance->getDatabase(), $this->instance->getAllDatabases(), true)) {
             $this->instance->createDatabase($this->instance->getDatabase());
         }
     }

Braces +6 added lines, -6 removed lines

@@ -72,7 +72,7 @@ 
         if ($item instanceof Item) {
             try{
                 $this->instance->putDocument(['data' => $this->encode($this->driverPreWrap($item))], $item->getEncodedKey(), $this->getLatestDocumentRevision($item->getEncodedKey()));
-            }catch (CouchDBException $e){
+            } catch (CouchDBException $e){
                 throw new phpFastCacheDriverException('Got error while trying to upsert a document: ' . $e->getMessage(), null, $e);
             }
             return true;
@@ -90,15 +90,15 @@ 
     {
         try{
             $response = $this->instance->findDocument($item->getEncodedKey());
-        }catch (CouchDBException $e){
+        } catch (CouchDBException $e){
             throw new phpFastCacheDriverException('Got error while trying to get a document: ' . $e->getMessage(), null, $e);
         }
 
         if($response->status === 404 || empty($response->body['data'])){
             return null;
-        }else if($response->status === 200){
+        } else if($response->status === 200){
             return $this->decode($response->body['data']);
-        }else{
+        } else{
             throw new phpFastCacheDriverException('Got unexpected HTTP status: ' . $response->status);
         }
     }
@@ -117,7 +117,7 @@ 
         if ($item instanceof Item) {
             try{
                 $this->instance->deleteDocument($item->getEncodedKey(), $this->getLatestDocumentRevision($item->getEncodedKey()));
-            }catch (CouchDBException $e){
+            } catch (CouchDBException $e){
                 throw new phpFastCacheDriverException('Got error while trying to delete a document: ' . $e->getMessage(), null, $e);
             }
             return true;
@@ -135,7 +135,7 @@ 
         try{
             $this->instance->deleteDatabase($this->getDatabaseName());
             $this->createDatabase();
-        }catch (CouchDBException $e){
+        } catch (CouchDBException $e){
             throw new phpFastCacheDriverException('Got error while trying to delete and recreate the database: ' . $e->getMessage(), null, $e);
         }
 

src/phpFastCache/CacheManager.php

Braces +5 added lines, -5 removed lines

@@ -197,7 +197,7 @@ 
             try{
                 self::$instances[ $instance ] = new $class($config);
                 self::$instances[ $instance ]->setEventManager(EventManager::getInstance());
-            }catch(phpFastCacheDriverCheckException $e){
+            } catch(phpFastCacheDriverCheckException $e){
                 if($config['fallback']){
                     try{
                         $fallback = self::standardizeDriverName($config['fallback']);
@@ -206,13 +206,13 @@ 
                             self::$instances[ $instance ] = new $class($config);
                             self::$instances[ $instance ]->setEventManager(EventManager::getInstance());
                             trigger_error(sprintf('The "%s" driver is unavailable at the moment, the fallback driver "%s" has been used instead.', $driver, $fallback), E_USER_WARNING);
-                        }else{
+                        } else{
                             throw new phpFastCacheInvalidConfigurationException('The fallback driver cannot be the same than the default driver', 0, $e);
                         }
-                    }catch (phpFastCacheInvalidArgumentException $e){
+                    } catch (phpFastCacheInvalidArgumentException $e){
                         throw new phpFastCacheInvalidConfigurationException('Invalid fallback driver configuration', 0, $e);
                     }
-                }else{
+                } else{
                     throw new phpFastCacheDriverCheckException($e->getMessage(), $e->getCode(), $e);
                 }
             }
@@ -327,7 +327,7 @@ 
             self::$config = array_merge(self::$config, $name);
         } else if (is_string($name)){
             self::$config[ $name ] = $value;
-        }else{
+        } else{
             throw new phpFastCacheInvalidArgumentException('Invalid variable type: $name');
         }
     }

Doc Comments +3 added lines, -3 removed lines

@@ -345,7 +345,7 @@ 
 
 
     /**
-     * @return array
+     * @return ExtendedCacheItemPoolInterface[]
      */
     public static function getDefaultConfig()
     {
@@ -353,7 +353,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function getStaticSystemDrivers()
     {
@@ -380,7 +380,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function getStaticAllDrivers()
     {

Indentation +39 added lines, -39 removed lines

@@ -64,101 +64,101 @@ 
         /**
          * Specify if the item must provide detailed creation/modification dates
          */
-      'itemDetailedDate' => false,
+        'itemDetailedDate' => false,
 
         /**
          * Automatically attempt to fallback to temporary directory
          * if the cache fails to write on the specified directory
          */
-      'autoTmpFallback' => false,
+        'autoTmpFallback' => false,
 
         /**
          * Provide a secure file manipulation mechanism,
          * on intensive usage the performance can be affected.
          */
-      'secureFileManipulation' => false,
+        'secureFileManipulation' => false,
 
         /**
          * Ignore Symfony notice for Symfony project which
          * do not makes use of PhpFastCache's Symfony Bundle
          */
-      'ignoreSymfonyNotice' => false,
+        'ignoreSymfonyNotice' => false,
 
         /**
          * Default time-to-live in second
          */
-      'defaultTtl' => 900,
+        'defaultTtl' => 900,
 
         /**
          * Default key hash function
          * (md5 by default)
          */
-      'defaultKeyHashFunction' => '',
+        'defaultKeyHashFunction' => '',
 
         /**
          * The securityKey that will be used
          * to create sub-directory
          * (Files-based drivers only)
          */
-      'securityKey' => 'Auto',
+        'securityKey' => 'Auto',
 
         /**
          * Auto-generate .htaccess if it's missing
          * (Files-based drivers only)
          */
-      'htaccess' => true,
+        'htaccess' => true,
 
         /**
          * Default files chmod
          * 0777 recommended
          * (Files-based drivers only)
          */
-      'default_chmod' => 0777,
+        'default_chmod' => 0777,
 
         /**
          * The path where we will writecache files
          * default value if empty: sys_get_temp_dir()
          * (Files-based drivers only)
          */
-      'path' => '',
+        'path' => '',
 
         /**
          * Driver fallback in case of failure.
          * Caution, in case of failure an E_WARNING
          * error will always be raised
          */
-      'fallback' => false,
+        'fallback' => false,
 
         /**
          * Maximum size (bytes) of object store in memory
          * (Memcache(d) drivers only)
          */
-      'limited_memory_each_object' => 4096,
+        'limited_memory_each_object' => 4096,
 
         /**
          * Compress stored data, if the backend supports it
          * (Memcache(d) drivers only)
          */
-      'compress_data' => false,
+        'compress_data' => false,
 
         /**
          * Prevent cache slams when
          * making use of heavy cache
          * items
          */
-      'preventCacheSlams' => false,
+        'preventCacheSlams' => false,
 
         /**
          * Cache slams timeout
          * in seconds
          */
-      'cacheSlamsTimeout' => 15,
+        'cacheSlamsTimeout' => 15,
 
         /**
          * Cache slams timeout
          * in seconds
          */
-      'cacheFileExtension' => 'txt',
+        'cacheFileExtension' => 'txt',
 
     ];
 
@@ -168,7 +168,7 @@ 
      * @var array
      */
     protected static $safeFileExtensions = [
-      'txt', 'cache', 'db', 'pfc'
+        'txt', 'cache', 'db', 'pfc'
     ];
 
     /**
@@ -373,24 +373,24 @@ 
     public static function getStaticSystemDrivers()
     {
         return [
-          'Apc',
-          'Apcu',
-          'Cassandra',
-          'Couchbase',
-          'Couchdb',
-          'Devnull',
-          'Files',
-          'Leveldb',
-          'Memcache',
-          'Memcached',
-          'Memstatic',
-          'Mongodb',
-          'Predis',
-          'Redis',
-          'Ssdb',
-          'Sqlite',
-          'Wincache',
-          'Xcache',
+            'Apc',
+            'Apcu',
+            'Cassandra',
+            'Couchbase',
+            'Couchdb',
+            'Devnull',
+            'Files',
+            'Leveldb',
+            'Memcache',
+            'Memcached',
+            'Memstatic',
+            'Mongodb',
+            'Predis',
+            'Redis',
+            'Ssdb',
+            'Sqlite',
+            'Wincache',
+            'Xcache',
         ];
     }
 
@@ -400,9 +400,9 @@ 
     public static function getStaticAllDrivers()
     {
         return array_merge(self::getStaticSystemDrivers(), [
-          'Devtrue',
-          'Devfalse',
-          'Cookie',
+            'Devtrue',
+            'Devfalse',
+            'Cookie',
         ]);
     }
 
@@ -504,7 +504,7 @@ 
                     }
                     if(!in_array($configValue, self::$safeFileExtensions)){
                         throw new phpFastCacheInvalidConfigurationException(
-                          "{$configName} is not a safe extension, currently allowed extension: " . implode(', ', self::$safeFileExtensions)
+                            "{$configName} is not a safe extension, currently allowed extension: " . implode(', ', self::$safeFileExtensions)
                         );
                     }
                     break;

Spacing +38 added lines, -38 removed lines

@@ -203,42 +203,42 @@ 
         }
 
         $instance = crc32($driver . serialize($config));
-        if (!isset(self::$instances[ $instance ])) {
+        if (!isset(self::$instances[$instance])) {
             $badPracticeOmeter[$driver] = 1;
-            if(!$config['ignoreSymfonyNotice'] && interface_exists('Symfony\Component\HttpKernel\KernelInterface') && !class_exists('phpFastCache\Bundle\phpFastCacheBundle')){
+            if (!$config['ignoreSymfonyNotice'] && interface_exists('Symfony\Component\HttpKernel\KernelInterface') && !class_exists('phpFastCache\Bundle\phpFastCacheBundle')) {
                 trigger_error('A Symfony Bundle to make the PhpFastCache integration more easier is now available here: https://github.com/PHPSocialNetwork/phpfastcache-bundle', E_USER_NOTICE);
             }
             $class = self::getNamespacePath() . $driver . '\Driver';
-            try{
-                self::$instances[ $instance ] = new $class($config);
-                self::$instances[ $instance ]->setEventManager(EventManager::getInstance());
-            }catch(phpFastCacheDriverCheckException $e){
-                if($config['fallback']){
-                    try{
+            try {
+                self::$instances[$instance] = new $class($config);
+                self::$instances[$instance]->setEventManager(EventManager::getInstance());
+            } catch (phpFastCacheDriverCheckException $e) {
+                if ($config['fallback']) {
+                    try {
                         $fallback = self::standardizeDriverName($config['fallback']);
-                        if($fallback !== $driver){
+                        if ($fallback !== $driver) {
                             $class = self::getNamespacePath() . $fallback . '\Driver';
-                            self::$instances[ $instance ] = new $class($config);
-                            self::$instances[ $instance ]->setEventManager(EventManager::getInstance());
+                            self::$instances[$instance] = new $class($config);
+                            self::$instances[$instance]->setEventManager(EventManager::getInstance());
                             trigger_error(sprintf('The "%s" driver is unavailable at the moment, the fallback driver "%s" has been used instead.', $driver, $fallback), E_USER_WARNING);
-                        }else{
+                        } else {
                             throw new phpFastCacheInvalidConfigurationException('The fallback driver cannot be the same than the default driver', 0, $e);
                         }
-                    }catch (phpFastCacheInvalidArgumentException $e){
+                    } catch (phpFastCacheInvalidArgumentException $e) {
                         throw new phpFastCacheInvalidConfigurationException('Invalid fallback driver configuration', 0, $e);
                     }
-                }else{
+                } else {
                     throw new phpFastCacheDriverCheckException($e->getMessage(), $e->getCode(), $e);
                 }
             }
-        } else if($badPracticeOmeter[$driver] >= 5){
+        } else if ($badPracticeOmeter[$driver] >= 5) {
             trigger_error('[' . $driver . '] Calling many times CacheManager::getInstance() for already instanced drivers is a bad practice and have a significant impact on performances.
            See https://github.com/PHPSocialNetwork/phpfastcache/wiki/[V5]-Why-calling-getInstance%28%29-each-time-is-a-bad-practice-%3F');
         }
 
         $badPracticeOmeter[$driver]++;
 
-        return self::$instances[ $instance ];
+        return self::$instances[$instance];
     }
 
     /**
@@ -299,7 +299,7 @@ 
      */
     public static function __callStatic($name, $arguments)
     {
-        $options = (array_key_exists(0, $arguments) && is_array($arguments) ? $arguments[ 0 ] : []);
+        $options = (array_key_exists(0, $arguments) && is_array($arguments) ? $arguments[0] : []);
 
         return self::getInstance($name, $options);
     }
@@ -340,9 +340,9 @@ 
     {
         if (is_array($name)) {
             self::$config = array_merge(self::$config, $name);
-        } else if (is_string($name)){
-            self::$config[ $name ] = $value;
-        }else{
+        } else if (is_string($name)) {
+            self::$config[$name] = $value;
+        } else {
             throw new phpFastCacheInvalidArgumentException('Invalid variable type: $name');
         }
     }
@@ -413,7 +413,7 @@ 
      */
     public static function standardizeDriverName($driverName)
     {
-        if(!is_string($driverName)){
+        if (!is_string($driverName)) {
             throw new phpFastCacheInvalidArgumentException(sprintf('Expected $driverName to be a string got "%s" instead', gettype($driverName)));
         }
         return ucfirst(strtolower(trim($driverName)));
@@ -428,81 +428,81 @@ 
     protected static function validateConfig(array $config)
     {
         foreach ($config as $configName => $configValue) {
-            switch($configName)
+            switch ($configName)
             {
                 case 'itemDetailedDate':
-                    if(!is_bool($configValue)){
+                    if (!is_bool($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be a boolean");
                     }
                     break;
                 case 'autoTmpFallback':
-                    if(!is_bool($configValue)){
+                    if (!is_bool($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be a boolean");
                     }
                     break;
                 case 'secureFileManipulation':
-                    if(!is_bool($configValue)){
+                    if (!is_bool($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be a boolean");
                     }
                     break;
                 case 'ignoreSymfonyNotice':
-                    if(!is_bool($configValue)){
+                    if (!is_bool($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be a boolean");
                     }
                     break;
                 case 'defaultTtl':
-                    if(!is_numeric($configValue)){
+                    if (!is_numeric($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be numeric");
                     }
                     break;
                 case 'defaultKeyHashFunction':
-                    if(!is_string($configValue) && !function_exists($configValue)){
+                    if (!is_string($configValue) && !function_exists($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be a valid function name string");
                     }
                     break;
                 case 'securityKey':
-                    if(!is_string($configValue)){
+                    if (!is_string($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be a string");
                     }
                     break;
                 case 'htaccess':
-                    if(!is_bool($configValue)){
+                    if (!is_bool($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be a boolean");
                     }
                     break;
                 case 'default_chmod':
-                    if(!is_int($configValue)){
+                    if (!is_int($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be an integer");
                     }
                     break;
                 case 'path':
-                    if(!is_string($configValue)){
+                    if (!is_string($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be a string");
                     }
                     break;
                 case 'fallback':
-                    if(!is_bool($configValue)){
+                    if (!is_bool($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be a boolean");
                     }
                     break;
                 case 'limited_memory_each_object':
-                    if(!is_int($configValue)){
+                    if (!is_int($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be an integer");
                     }
                     break;
                 case 'compress_data':
-                    if(!is_bool($configValue)){
+                    if (!is_bool($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be a boolean");
                     }
                     break;
                 case 'cacheFileExtension':
-                    if(!is_string($configValue)){
+                    if (!is_string($configValue)) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} must be a boolean");
                     }
-                    if(strpos($configValue, '.') !== false){
+                    if (strpos($configValue, '.') !== false) {
                         throw new phpFastCacheInvalidConfigurationException("{$configName} cannot contain a dot \".\"");
                     }
-                    if(!in_array($configValue, self::$safeFileExtensions)){
+                    if (!in_array($configValue, self::$safeFileExtensions)) {
                         throw new phpFastCacheInvalidConfigurationException(
                           "{$configName} is not a safe extension, currently allowed extension: " . implode(', ', self::$safeFileExtensions)
                         );