Bugfixes

Author: Nyholm

src/FilesystemCachePool.php

@@ -21,6 +21,7 @@
  */
 class FilesystemCachePool extends AbstractCachePool
 {
+    const CACHE_PATH = 'cache';
     /**
      * @var Filesystem
      */
@@ -32,33 +33,53 @@ class FilesystemCachePool extends AbstractCachePool
     public function __construct(Filesystem $filesystem)
     {
         $this->filesystem = $filesystem;
-        $this->filesystem->createDir('cache');
+        $this->filesystem->createDir(self::CACHE_PATH);
     }
 
     protected function fetchObjectFromCache($key)
     {
-        return $this->filesystem->read($key);
+        $file = $this->getFilePath($key);
+        if (!$this->filesystem->has($file)) {
+            return;
+        }
+
+        return unserialize($this->filesystem->read($file));
     }
 
     protected function clearAllObjectsFromCache()
     {
-        $this->filesystem->deleteDir('cache');
-        $this->filesystem->createDir('cache');
+        $this->filesystem->deleteDir(self::CACHE_PATH);
+        $this->filesystem->createDir(self::CACHE_PATH);
 
         return true;
     }
 
     protected function clearOneObjectFromCache($key)
     {
         try {
-            return $this->filesystem->delete($key);
+            return $this->filesystem->delete($this->getFilePath($key));
         } catch (FileNotFoundException $e) {
             return true;
         }
     }
 
     protected function storeItemInCache($key, CacheItemInterface $item, $ttl)
     {
-        return $this->filesystem->write($key, $item);
+        $file = $this->getFilePath($key);
+        if ($this->filesystem->has($file)) {
+            $this->filesystem->delete($file);
+        }
+
+        return $this->filesystem->write($file, serialize($item));
+    }
+
+    /**
+     * @param $key
+     *
+     * @return mixed
+     */
+    private function getFilePath($key)
+    {
+        return sprintf('%s/%s', self::CACHE_PATH, urlencode(base64_encode($key)));
     }
 }

tests/IntegrationPoolTest.php

@@ -12,12 +12,28 @@
 namespace Cache\Adapter\Filesystem\tests;
 
 use Cache\Adapter\Filesystem\FilesystemCachePool;
-use Cache\IntegrationTests\CachePoolTest as BaseTest;
+use Cache\IntegrationTests\CachePoolTest;
+use League\Flysystem\Adapter\Local;
+use League\Flysystem\Filesystem;
 
-class IntegrationPoolTest extends BaseTest
+class IntegrationPoolTest extends CachePoolTest
 {
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
     public function createCachePool()
     {
-        return new FilesystemCachePool();
+        return new FilesystemCachePool($this->getFilesystem());
+    }
+
+    private function getFilesystem()
+    {
+        if ($this->filesystem === null) {
+            $this->filesystem = new Filesystem(new Local(__DIR__.'/'));
+        }
+
+        return $this->filesystem;
     }
 }

tests/IntegrationTagTest.php

@@ -13,11 +13,27 @@
 
 use Cache\Adapter\Filesystem\FilesystemCachePool;
 use Cache\IntegrationTests\TaggableCachePoolTest;
+use League\Flysystem\Adapter\Local;
+use League\Flysystem\Filesystem;
 
 class IntegrationTagTest extends TaggableCachePoolTest
 {
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
     public function createCachePool()
     {
-        return new FilesystemCachePool();
+        return new FilesystemCachePool($this->getFilesystem());
+    }
+
+    private function getFilesystem()
+    {
+        if ($this->filesystem === null) {
+            $this->filesystem = new Filesystem(new Local(__DIR__.'/'));
+        }
+
+        return $this->filesystem;
     }
 }