Merge pull request #784 from Geolim4/master

Fixed issues in #782

Author: Geolim4

lib/Phpfastcache/Core/Pool/IO/IOHelperTrait.php

@@ -290,16 +290,16 @@ protected function encodeFilename($keyword): string
      */
     protected function readFile($file): string
     {
+        if (!\is_readable($file)) {
+            throw new PhpfastcacheIOException("Cannot read file located at: {$file}");
+        }
         if (\function_exists('file_get_contents')) {
             return (string)\file_get_contents($file);
         }
 
         $string = '';
 
         $file_handle = @\fopen($file, 'rb');
-        if (!$file_handle) {
-            throw new PhpfastcacheIOException("Cannot read file located at: {$file}");
-        }
         while (!\feof($file_handle)) {
             $line = \fgets($file_handle);
             $string .= $line;

lib/Phpfastcache/Drivers/Files/Driver.php

@@ -20,7 +20,7 @@
 use FilesystemIterator;
 use Phpfastcache\Cluster\AggregatablePoolInterface;
 use Phpfastcache\Core\Pool\{DriverBaseTrait, ExtendedCacheItemPoolInterface, IO\IOHelperTrait};
-use Phpfastcache\Exceptions\{PhpfastcacheInvalidArgumentException};
+use Phpfastcache\Exceptions\{PhpfastcacheInvalidArgumentException, PhpfastcacheIOException};
 use Phpfastcache\Util\Directory;
 use Psr\Cache\CacheItemInterface;
 
@@ -74,16 +74,14 @@ protected function driverConnect(): bool
      */
     protected function driverRead(CacheItemInterface $item)
     {
-        /**
-         * Check for Cross-Driver type confusion
-         */
         $file_path = $this->getFilePath($item->getKey(), true);
-        if (!\file_exists($file_path)) {
+
+        try{
+            $content = $this->readFile($file_path);
+        }catch (PhpfastcacheIOException $e){
             return null;
         }
 
-        $content = $this->readFile($file_path);
-
         return $this->decode($content);
     }
 

lib/Phpfastcache/Drivers/Riak/Driver.php

@@ -60,7 +60,7 @@ public function getStats(): DriverStatistic
         return (new DriverStatistic())
             ->setData(implode(', ', array_keys($this->itemInstances)))
             ->setRawData($info)
-            ->setSize(false)
+            ->setSize(0)
             ->setInfo('Riak does not provide size/date information att all :(');
     }
 

lib/Phpfastcache/Util/Directory.php

@@ -101,15 +101,19 @@ public static function rrmdir(string $source, bool $removeOnlyChildren = false):
             /**
              * @var SplFileInfo $fileinfo
              */
-            if ($fileinfo->isDir()) {
-                if (self::rrmdir($fileinfo->getRealPath()) === false) {
-                    return false;
-                }
-            } else {
-                if (unlink($fileinfo->getRealPath()) === false) {
+            $realpath = $fileinfo->getRealPath();
+            if($realpath){
+                if ($fileinfo->isDir()) {
+                    if (self::rrmdir($fileinfo->getRealPath()) === false) {
+                        return false;
+                    }
+                } elseif (unlink($realpath) === false) {
                     return false;
                 }
             }
+            else{
+                return false;
+            }
         }
 
         if ($removeOnlyChildren === false) {
@@ -148,4 +152,4 @@ public static function getAbsolutePath(string $path): string
         $prefix = $__FILE__[0] === DIRECTORY_SEPARATOR ? DIRECTORY_SEPARATOR : '';
         return $prefix . implode(DIRECTORY_SEPARATOR, $absolutes);
     }
-}
+}