PHPSocialNetwork / phpfastcache

src/phpFastCache/Drivers/Zendshm/Driver.php

Spacing +2 added lines, -2 removed lines

@@ -133,8 +133,8 @@
         $stats = (array) zend_shm_cache_info();
         return (new driverStatistic())
             ->setData(implode(', ', array_keys($this->namespaces)))
-            ->setInfo(sprintf("The Zend memory have %d item(s) in cache.\n For more information see RawData.",$stats[ 'items_total' ]))
+            ->setInfo(sprintf("The Zend memory have %d item(s) in cache.\n For more information see RawData.", $stats['items_total']))
             ->setRawData($stats)
-            ->setSize($stats[ 'memory_total' ]);
+            ->setSize($stats['memory_total']);
     }
 }
\ No newline at end of file

src/phpFastCache/Helper/ActOnAll.php

Braces +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
                     } else {
                         $item->setHit(true);
                     }
-                }else{
+                } else{
                     $item->expiresAfter(abs((int) $this->getConfig()[ 'defaultTtl' ]));
                 }
 

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
      */
     public function __construct()
     {
-        $this->instances =& CacheManager::getInternalInstances();
+        $this->instances = & CacheManager::getInternalInstances();
     }
 
     /**
@@ -29,22 +29,22 @@ 
      */
     protected function getGenericCallback()
     {
-        return function($method, $args){
+        return function($method, $args) {
             $getterMethod = (strpos($method, 'get') === 0);
             $return = false;
 
-            if($getterMethod){
+            if ($getterMethod) {
                 $return = [];
             }
 
             foreach ($this->instances as $instance)
             {
                 $reflectionMethod = new \ReflectionMethod(get_class($instance), $method);
-                if($getterMethod){
-                    $return[ $instance->getDriverName() ] = $reflectionMethod->invokeArgs($instance, $args);
-                }else{
+                if ($getterMethod) {
+                    $return[$instance->getDriverName()] = $reflectionMethod->invokeArgs($instance, $args);
+                } else {
                     $result = $reflectionMethod->invokeArgs($instance, $args);
-                    if($result !== false){
+                    if ($result !== false) {
                         $return = $result;
                     }
                 }

src/phpFastCache/EventManager.php

Braces +3 added lines, -3 removed lines

@@ -84,13 +84,13 @@
             if(is_callable($arguments[0])){
                 if(isset($arguments[1]) && is_string($arguments[0])){
                     $this->events[$name][$arguments[1]] = $arguments[0];
-                }else {
+                } else {
                     $this->events[$name][] = $arguments[0];
                 }
-            }else{
+            } else{
                 throw new \InvalidArgumentException(sprintf('Expected Callable, got "%s"', gettype($arguments[0])));
             }
-        }else{
+        } else{
             throw new \BadMethodCallException('An event must start with "on" such as "onCacheGetItem"');
         }
     }

Spacing +9 added lines, -9 removed lines

@@ -66,8 +66,8 @@ 
     public function dispatch($eventName, ...$args)
     {
         $eventName = 'on' . ucfirst($eventName);
-        if(array_key_exists($eventName, $this->events)){
-            foreach ($this->events[ $eventName ] as $event) {
+        if (array_key_exists($eventName, $this->events)) {
+            foreach ($this->events[$eventName] as $event) {
                 call_user_func_array($event, $args);
             }
         }
@@ -81,17 +81,17 @@ 
      */
     public function __call($name, $arguments)
     {
-        if(strpos($name, 'on') === 0){
-            if(is_callable($arguments[0])){
-                if(isset($arguments[1]) && is_string($arguments[0])){
+        if (strpos($name, 'on') === 0) {
+            if (is_callable($arguments[0])) {
+                if (isset($arguments[1]) && is_string($arguments[0])) {
                     $this->events[$name][$arguments[1]] = $arguments[0];
-                }else {
+                } else {
                     $this->events[$name][] = $arguments[0];
                 }
-            }else{
+            } else {
                 throw new \InvalidArgumentException(sprintf('Expected Callable, got "%s"', gettype($arguments[0])));
             }
-        }else{
+        } else {
             throw new \BadMethodCallException('An event must start with "on" such as "onCacheGetItem"');
         }
     }
@@ -103,7 +103,7 @@ 
      */
     public function unbindEventCallback($eventName, $callbackName)
     {
-        if(isset($this->events[$eventName][$callbackName])){
+        if (isset($this->events[$eventName][$callbackName])) {
             unset($this->events[$eventName][$callbackName]);
             return true;
         }

tests/NewCacheInstance.test.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,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";
 }
 

Braces +1 added lines, -1 removed lines

@@ -15,7 +15,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";
 }
 

tests/ActOnAll.test.php

Spacing +4 added lines, -4 removed lines

@@ -25,21 +25,21 @@
 $actOnAll = new ActOnAll();
 $statsAry = $actOnAll->getStats();
 
-if(is_array($statsAry)){
-    if(count($statsAry) !== 3){
+if (is_array($statsAry)) {
+    if (count($statsAry) !== 3) {
         $status = 1;
         echo 'Wrong count of driverStatistics objects: Got ' . count($statsAry) . " element(s), expected 3\n";
         goto endOfTest;
     }
 
     foreach ($statsAry as $stat) {
-        if(!is_object($stat) || !($stat instanceof driverStatistic)){
+        if (!is_object($stat) || !($stat instanceof driverStatistic)) {
             echo "\$statsAry contains one element that is not an driverStatistic object\n";
             goto endOfTest;
         }
     }
     echo "[PASS] ActOnAll helper passed all tests\n";
-}else{
+} else {
     $status = 1;
     echo "\$statsAry is not an array\n";
 }

Braces +1 added lines, -1 removed lines

@@ -15,7 +15,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";
 }
 

tests/EventManager.test.php

Spacing +4 added lines, -4 removed lines

@@ -16,8 +16,8 @@ 
 $status = 0;
 echo "Testing EventManager\n";
 
-EventManager::getInstance()->onCacheSaveItem(function(ExtendedCacheItemPoolInterface $itemPool, ExtendedCacheItemInterface $item){
-    if($item->get() === 1000){
+EventManager::getInstance()->onCacheSaveItem(function(ExtendedCacheItemPoolInterface $itemPool, ExtendedCacheItemInterface $item) {
+    if ($item->get() === 1000) {
         $item->increment(337);
     }
 });
@@ -30,9 +30,9 @@ 
 $cacheInstance->save($item);
 
 
-if($cacheInstance->getItem($cacheKey)->get() === 1337){
+if ($cacheInstance->getItem($cacheKey)->get() === 1337) {
     echo "[PASS] The dispatched event executed the custom callback to alter to item.\n";
-}else{
+} else {
     echo "[FAIL] The dispatched event did not worked well, the expected value '1337', got '" . (int) $cacheInstance->getItem($cacheKey)->get() . "'\n";
     $status = 1;
 }

Braces +1 added lines, -1 removed lines

@@ -15,7 +15,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";
 }
 

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()
     {

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

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);

Doc Comments +4 added lines, -4 removed lines

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

Indentation +8 added lines, -8 removed lines

@@ -202,9 +202,9 @@ 
     protected static function cleanFileName($filename)
     {
         $regex = [
-          '/[\?\[\]\/\\\=\<\>\:\;\,\'\"\&\$\#\*\(\)\|\~\`\!\{\}]/',
-          '/\.$/',
-          '/^\./',
+            '/[\?\[\]\/\\\=\<\>\:\;\,\'\"\&\$\#\*\(\)\|\~\`\!\{\}]/',
+            '/\.$/',
+            '/^\./',
         ];
         $replace = ['-', '', ''];
 
@@ -296,7 +296,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);
@@ -338,11 +338,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;
     }

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;