Merge pull request #3 from Nyholm/patch-1

fix #1
php-cache · Jan 7, 2016 · 1985f7a · 1985f7a
2 parents 67256bf + 49e1b50
commit 1985f7a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/src/FilesystemCachePool.php b/src/FilesystemCachePool.php
@@ -12,6 +12,7 @@
 namespace Cache\Adapter\Filesystem;
 
 use Cache\Adapter\Common\AbstractCachePool;
+use Cache\Adapter\Common\Exception\InvalidArgumentException;
 use League\Flysystem\FileNotFoundException;
 use League\Flysystem\Filesystem;
 use Psr\Cache\CacheItemInterface;
@@ -74,12 +75,17 @@ protected function storeItemInCache($key, CacheItemInterface $item, $ttl)
     }
 
     /**
-     * @param $key
+     * @param string $key
      *
-     * @return mixed
+     * @return string
+     * @throws InvalidArgumentException
      */
     private function getFilePath($key)
     {
-        return sprintf('%s/%s', self::CACHE_PATH, urlencode(base64_encode($key)));
+        if (!preg_match('|^[a-zA-Z0-9_\.: ]+$|', $key)) {
+            throw new InvalidArgumentException(sprintf('Invalid key "%s". Valid keys must match [a-zA-Z0-9_\.:].', $key));
+        }
+
+        return sprintf('%s/%s', self::CACHE_PATH, $key);
     }
 }
diff --git a/tests/FilesystemCachePoolTest.php b/tests/FilesystemCachePoolTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Cache\Adapter\Filesystem\tests;
+
+use Cache\Adapter\Filesystem\FilesystemCachePool;
+use League\Flysystem\Filesystem;
+use League\Flysystem\Adapter\Local;
+
+/**
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+class FilesystemCachePoolTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @expectedException \Psr\Cache\InvalidArgumentException
+     */
+    public function testInvalidKey()
+    {
+        $pool = new FilesystemCachePool(new Filesystem(new Local(__DIR__.'/')));
+
+        $pool->getItem('test%string');
+    }
+}