PHPSocialNetwork / phpfastcache

src/phpFastCache/Drivers/Files/Driver.php

Doc Comments +4 added lines, -4 removed lines

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

Indentation +4 added lines, -4 removed lines

@@ -215,11 +215,11 @@
         }
 
         $stat->setData(implode(', ', array_keys($this->itemInstances)))
-          ->setRawData([
+            ->setRawData([
             'tmp' => $this->tmp
-          ])
-          ->setSize(Directory::dirSize($path))
-          ->setInfo('Number of files used to build the cache: ' . Directory::getFileCount($path));
+            ])
+            ->setSize(Directory::dirSize($path))
+            ->setInfo('Number of files used to build the cache: ' . Directory::getFileCount($path));
 
         return $stat;
     }

src/phpFastCache/Core/Pool/IO/IOHelperTrait.php

Indentation +4 added lines, -4 removed lines

@@ -186,9 +186,9 @@ 
     protected static function cleanFileName($filename)
     {
         $regex = [
-          '/[\?\[\]\/\\\=\<\>\:\;\,\'\"\&\$\#\*\(\)\|\~\`\!\{\}]/',
-          '/\.$/',
-          '/^\./',
+            '/[\?\[\]\/\\\=\<\>\:\;\,\'\"\&\$\#\*\(\)\|\~\`\!\{\}]/',
+            '/\.$/',
+            '/^\./',
         ];
         $replace = ['-', '', ''];
 
@@ -277,7 +277,7 @@ 
             $tmpFilename = Directory::getAbsolutePath(dirname($file) . '/tmp_' . md5(
                 str_shuffle(uniqid($this->getDriverName(), false))
                 . str_shuffle(uniqid($this->getDriverName(), false))
-              ));
+                ));
 
             $f = fopen($tmpFilename, 'w+');
             flock($f, LOCK_EX);

Doc Comments +4 added lines, -4 removed lines

@@ -130,7 +130,7 @@ 
     }
 
     /**
-     * @param $keyword
+     * @param string|false $keyword
      * @param bool $skip
      * @return string
      * @throws phpFastCacheIOException
@@ -176,7 +176,7 @@ 
 
     /**
      * @param $filename
-     * @return mixed
+     * @return string
      */
     protected static function cleanFileName($filename)
     {
@@ -191,7 +191,7 @@ 
     }
 
     /**
-     * @param $path
+     * @param string $path
      * @param bool $create
      * @throws phpFastCacheIOException
      */
@@ -225,7 +225,7 @@ 
 
 
     /**
-     * @param $file
+     * @param string $file
      * @return string
      * @throws phpFastCacheIOException
      */

Braces +3 added lines, -3 removed lines

@@ -97,11 +97,11 @@ 
                 return $tmp_dir;
             }
             return $full_path;
-        }else{
+        } else{
             if (!isset($this->tmp[ $full_path_hash ]) || (!@file_exists($full_path) || !@is_writable($full_path))) {
                 if (!@file_exists($full_path)) {
                     @mkdir($full_path, $this->setChmodAuto(), true);
-                }else if (!@is_writable($full_path)) {
+                } else if (!@is_writable($full_path)) {
                     @chmod($full_path, $this->setChmodAuto());
                 }
 
@@ -312,7 +312,7 @@ 
             if(!rename($tmpFilename, $file)){
                 throw new phpFastCacheIOException(sprintf('Failed to rename %s to %s', $tmpFilename, $file));
             }
-        }else{
+        } else{
             $f = fopen($file, 'w+');
             $octetWritten = fwrite($f, $data);
             fclose($f);

Spacing +18 added lines, -18 removed lines

@@ -41,10 +41,10 @@ 
          * Calculate the security key
          */
         {
-            $securityKey = array_key_exists('securityKey', $this->config) ? $this->config[ 'securityKey' ] : '';
+            $securityKey = array_key_exists('securityKey', $this->config) ? $this->config['securityKey'] : '';
             if (!$securityKey || $securityKey === 'auto') {
-                if (isset($_SERVER[ 'HTTP_HOST' ])) {
-                    $securityKey = preg_replace('/^www./', '', strtolower(str_replace(':', '_', $_SERVER[ 'HTTP_HOST' ])));
+                if (isset($_SERVER['HTTP_HOST'])) {
+                    $securityKey = preg_replace('/^www./', '', strtolower(str_replace(':', '_', $_SERVER['HTTP_HOST'])));
                 } else {
                     $securityKey = ($this->isPHPModule() ? 'web' : 'cli');
                 }
@@ -63,10 +63,10 @@ 
          */
         $tmp_dir = rtrim($tmp_dir, '/') . DIRECTORY_SEPARATOR;
 
-        if (empty($this->config[ 'path' ]) || !is_string($this->config[ 'path' ])) {
+        if (empty($this->config['path']) || !is_string($this->config['path'])) {
             $path = $tmp_dir;
         } else {
-            $path = rtrim($this->config[ 'path' ], '/') . DIRECTORY_SEPARATOR;
+            $path = rtrim($this->config['path'], '/') . DIRECTORY_SEPARATOR;
         }
 
         $path_suffix = $securityKey . DIRECTORY_SEPARATOR . $this->getDriverName();
@@ -81,16 +81,16 @@ 
          * return the temp dir
          */
         if ($readonly === true) {
-            if($this->config[ 'autoTmpFallback' ] && (!@file_exists($full_path) || !@is_writable($full_path))){
+            if ($this->config['autoTmpFallback'] && (!@file_exists($full_path) || !@is_writable($full_path))) {
                 return $full_path_tmp;
             }
             return $full_path;
-        }else{
-            if (!isset($this->tmp[ $full_path_hash ]) || (!@file_exists($full_path) || !@is_writable($full_path))) {
+        } else {
+            if (!isset($this->tmp[$full_path_hash]) || (!@file_exists($full_path) || !@is_writable($full_path))) {
                 if (!@file_exists($full_path)) {
                     @mkdir($full_path, $this->setChmodAuto(), true);
-                }else if (!@is_writable($full_path)) {
-                    if (!@chmod($full_path, $this->setChmodAuto()) && $this->config[ 'autoTmpFallback' ])
+                } else if (!@is_writable($full_path)) {
+                    if (!@chmod($full_path, $this->setChmodAuto()) && $this->config['autoTmpFallback'])
                     {
                         /**
                          * Switch back to tmp dir
@@ -112,8 +112,8 @@ 
                     throw new phpFastCacheIOException('PLEASE CREATE OR CHMOD ' . $full_path . ' - 0777 OR ANY WRITABLE PERMISSION!');
                 }
 
-                $this->tmp[ $full_path_hash ] = $full_path;
-                $this->htaccessGen($full_path, array_key_exists('htaccess', $this->config) ? $this->config[ 'htaccess' ] : false);
+                $this->tmp[$full_path_hash] = $full_path;
+                $this->htaccessGen($full_path, array_key_exists('htaccess', $this->config) ? $this->config['htaccess'] : false);
             }
         }
 
@@ -180,10 +180,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'];
         }
     }
 
@@ -213,7 +213,7 @@ 
         if ($create === true) {
             if (!is_writable($path)) {
                 try {
-                    if(!chmod($path, 0777)){
+                    if (!chmod($path, 0777)) {
                         throw new phpFastCacheIOException('Chmod failed on : ' . $path);
                     }
                 } catch (phpFastCacheIOException $e) {
@@ -284,7 +284,7 @@ 
          */
         $this->eventManager->dispatch('CacheWriteFileOnDisk', $this, $file, $secureFileManipulation);
 
-        if($secureFileManipulation){
+        if ($secureFileManipulation) {
             $tmpFilename = Directory::getAbsolutePath(dirname($file) . '/tmp_' . md5(
                 str_shuffle(uniqid($this->getDriverName(), false))
                 . str_shuffle(uniqid($this->getDriverName(), false))
@@ -296,10 +296,10 @@ 
             flock($f, LOCK_UN);
             fclose($f);
 
-            if(!rename($tmpFilename, $file)){
+            if (!rename($tmpFilename, $file)) {
                 throw new phpFastCacheIOException(sprintf('Failed to rename %s to %s', $tmpFilename, $file));
             }
-        }else{
+        } else {
             $f = fopen($file, 'w+');
             $octetWritten = fwrite($f, $data);
             fclose($f);

tests/ReadWriteOperations.test.php

Indentation +3 added lines, -3 removed lines

@@ -23,9 +23,9 @@
 $keys = [];
 
 $dirs = [
-  __DIR__ . '/../var/cache/IO-',
-  sys_get_temp_dir() . '/phpfastcache/IO-1',
-  sys_get_temp_dir() . '/phpfastcache/IO-2'
+    __DIR__ . '/../var/cache/IO-',
+    sys_get_temp_dir() . '/phpfastcache/IO-1',
+    sys_get_temp_dir() . '/phpfastcache/IO-2'
 ];
 
 

Spacing +5 added lines, -5 removed lines

@@ -39,9 +39,9 @@ 
     {
         $cacheInstanceName = 'cacheInstance' . $i;
 
-        $instances[$dirIndex][$cacheInstanceName] = CacheManager::getInstance('Files',array('path' => $dir . str_pad($i, 3, '0', STR_PAD_LEFT)));
+        $instances[$dirIndex][$cacheInstanceName] = CacheManager::getInstance('Files', array('path' => $dir . str_pad($i, 3, '0', STR_PAD_LEFT)));
 
-        foreach($keys[$dirIndex] as $index => $key)
+        foreach ($keys[$dirIndex] as $index => $key)
         {
             $items[$dirIndex][$index] = $instances[$dirIndex][$cacheInstanceName]->getItem($key);
             $items[$dirIndex][$index]->set("test-$dirIndex-$index")->expiresAfter(600);
@@ -51,11 +51,11 @@ 
         $instances[$dirIndex][$cacheInstanceName]->detachAllItems();
     }
 
-    foreach($instances[$dirIndex] as $cacheInstanceName => $instance)
+    foreach ($instances[$dirIndex] as $cacheInstanceName => $instance)
     {
-        foreach($keys[$dirIndex] as $index => $key)
+        foreach ($keys[$dirIndex] as $index => $key)
         {
-            if($instances[$dirIndex][$cacheInstanceName]->getItem($key)->get() === "test-$dirIndex-$index")
+            if ($instances[$dirIndex][$cacheInstanceName]->getItem($key)->get() === "test-$dirIndex-$index")
             {
                 echo "[PASS] Item #{$key} of instance #{$cacheInstanceName} of dir #{$dirIndex} has returned the expected value (" . gettype("test-$dirIndex-$index") . ":'" . "test-$dirIndex-$index" . "')\n";
             }

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
             if($instances[$dirIndex][$cacheInstanceName]->getItem($key)->get() === "test-$dirIndex-$index")
             {
                 echo "[PASS] Item #{$key} of instance #{$cacheInstanceName} of dir #{$dirIndex} has returned the expected value (" . gettype("test-$dirIndex-$index") . ":'" . "test-$dirIndex-$index" . "')\n";
-            }
-            else
+            } else
             {
                 echo "[FAIL] Item #{$key} of instance #{$cacheInstanceName} of dir #{$dirIndex} returned an unexpected value (" . gettype($instances[$dirIndex][$cacheInstanceName]->getItem($key)->get()) . ":'" . $instances[$dirIndex][$cacheInstanceName]->getItem($key)->get() . "') expected (" . gettype("test-$dirIndex-$index") . ":'" . "test-$dirIndex-$index" . "') \n";
                 $status = 255;

tests/Memstatic.test.php

Indentation +6 added lines, -6 removed lines

@@ -33,20 +33,20 @@
 $cacheResult = $cacheInstance->getItem($cacheKey)->get();
 
 if($cacheResult === $randomStr){
-  echo "[PASS] The cache key value match, got expected value '{$cacheResult}'\n";
+    echo "[PASS] The cache key value match, got expected value '{$cacheResult}'\n";
 }else{
-  echo "[FAIL] The cache key value match expected value '{$randomStr}', got '{$cacheResult}'\n";
-  $status = 1;
+    echo "[FAIL] The cache key value match expected value '{$randomStr}', got '{$cacheResult}'\n";
+    $status = 1;
 }
 echo "Clearing the whole cache to test item cleaning...\n";
 $cacheInstance->clear();
 $cacheResult = ($cacheInstance->getItem($cacheKey)->isHit() === false && $cacheInstance->getItem($cacheKey)->get() === null);
 
 if($cacheResult === true){
-  echo "[PASS] The cache item is null as expected\n";
+    echo "[PASS] The cache item is null as expected\n";
 }else{
-  echo "[FAIL] The cache is not null'\n";
-  $status = 1;
+    echo "[FAIL] The cache is not null'\n";
+    $status = 1;
 }
 
 exit($status);
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -32,9 +32,9 @@ 
 
 $cacheResult = $cacheInstance->getItem($cacheKey)->get();
 
-if($cacheResult === $randomStr){
+if ($cacheResult === $randomStr) {
   echo "[PASS] The cache key value match, got expected value '{$cacheResult}'\n";
-}else{
+} else {
   echo "[FAIL] The cache key value match expected value '{$randomStr}', got '{$cacheResult}'\n";
   $status = 1;
 }
@@ -42,9 +42,9 @@ 
 $cacheInstance->clear();
 $cacheResult = ($cacheInstance->getItem($cacheKey)->isHit() === false && $cacheInstance->getItem($cacheKey)->get() === null);
 
-if($cacheResult === true){
+if ($cacheResult === true) {
   echo "[PASS] The cache item is null as expected\n";
-}else{
+} else {
   echo "[FAIL] The cache is not null'\n";
   $status = 1;
 }

Braces +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 if (!class_exists('phpFastCache\CacheManager')) {
     echo "[FAIL] Autoload failed to find the CacheManager\n";
     $status = 255;
-}else{
+} else{
     echo "[PASS] Autoload successfully found the CacheManager\n";
 }
 
@@ -28,7 +28,7 @@ 
 if (!interface_exists('Psr\Cache\CacheItemInterface')) {
     echo "[FAIL] Autoload failed to find the Psr CacheItemInterface\n";
     $status = 255;
-}else{
+} else{
     echo "[PASS] Autoload successfully found the Psr CacheItemInterface\n";
 }
 

src/phpFastCache/Drivers/Memstatic/Driver.php

Indentation +16 added lines, -16 removed lines

@@ -29,9 +29,9 @@ 
 {
     use DriverBaseTrait;
 
-  /**
-   * @var array
-   */
+    /**
+     * @var array
+     */
     protected $staticStack = [];
 
     /**
@@ -85,7 +85,7 @@ 
     {
         $key = md5($item->getKey());
         if(isset($this->staticStack[$key])){
-          return $this->staticStack[$key];
+            return $this->staticStack[$key];
         }
         return null;
     }
@@ -101,12 +101,12 @@ 
          * Check for Cross-Driver type confusion
          */
         if ($item instanceof Item) {
-          $key = md5($item->getKey());
-          if(isset($this->staticStack[$key])){
-              unset($this->staticStack[$key]);
-              return true;
-          }
-          return false;
+            $key = md5($item->getKey());
+            if(isset($this->staticStack[$key])){
+                unset($this->staticStack[$key]);
+                return true;
+            }
+            return false;
         } else {
             throw new \InvalidArgumentException('Cross-Driver type confusion detected');
         }
@@ -117,9 +117,9 @@ 
      */
     protected function driverClear()
     {
-      unset($this->staticStack);
-      $this->staticStack = [];
-      return true;
+        unset($this->staticStack);
+        $this->staticStack = [];
+        return true;
     }
 
     /**
@@ -143,9 +143,9 @@ 
     {
         $stat = new driverStatistic();
         $stat->setInfo('[Memstatic] A memory static driver')
-          ->setSize(mb_strlen(serialize($this->staticStack)))
-          ->setData(implode(', ', array_keys($this->itemInstances)))
-          ->setRawData($this->staticStack);
+            ->setSize(mb_strlen(serialize($this->staticStack)))
+            ->setData(implode(', ', array_keys($this->itemInstances)))
+            ->setRawData($this->staticStack);
 
         return $stat;
     }

Spacing +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
     protected function driverRead(CacheItemInterface $item)
     {
         $key = md5($item->getKey());
-        if(isset($this->staticStack[$key])){
+        if (isset($this->staticStack[$key])) {
           return $this->staticStack[$key];
         }
         return null;
@@ -102,7 +102,7 @@ 
          */
         if ($item instanceof Item) {
           $key = md5($item->getKey());
-          if(isset($this->staticStack[$key])){
+          if (isset($this->staticStack[$key])) {
               unset($this->staticStack[$key]);
               return true;
           }