- Fix trailing slash + keying issue

MrEssex · Jun 22, 2020 · e331757 · e331757
1 parent 937bc17
commit e331757
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/FileCache.php b/src/FileCache.php
@@ -6,6 +6,8 @@
 use DateInterval;
 use DateTime;
 use Psr\SimpleCache\CacheInterface;
+use function file_exists;
+use function str_replace;
 
 /**
  * Class FileCache
@@ -142,9 +144,7 @@ public function set($key, $value, $ttl = null): bool
      */
     private function _getPath(string $key): string
     {
-        if (substr($key, -1) === '/') {
-            $key = substr($key, 0, -1);
-        }
+        $key = str_replace('/', '', $key);
 
         return $this->_directoryPath . $key;
     }
@@ -279,10 +279,10 @@ public function deleteMultiple($keys)
      */
     public function has($key): bool
     {
-        $path = $this->_getPath($key);
         $keyOriginal = $key;
-        $key  = $this->_generateKey($key);
+        $key = $this->_generateKey($key);
         $this->_validateKey($key);
+        $path = $this->_getPath($key);
 
         if (! $this->_checkFileIsNotAtEndOfLife($path, $keyOriginal)) {
             return false;