Fixed directory listings for Noop caching

thephpleague · Mar 9, 2014 · b6cdd39 · b6cdd39
1 parent 78cd781
commit b6cdd39
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/src/Cache/Noop.php b/src/Cache/Noop.php
@@ -2,6 +2,8 @@
 
 namespace League\Flysystem\Cache;
 
+use League\Flysystem\Util;
+
 class Noop extends AbstractCache
 {
     /**
@@ -38,9 +40,33 @@ public function setComplete($dirname, $recursive)
      */
     public function storeContents($directory, array $contents, $recursive)
     {
+        if ($recursive) {
+            return $contents;
+        }
+
+        foreach ($contents as $index => $object) {
+            $pathinfo = Util::pathinfo($object['path']);
+            $object = array_merge($pathinfo, $object);
+
+            if ( ! $recursive && $object['dirname'] !== $directory) {
+                unset($contents[$index]);
+                continue;
+            }
+
+            $contents[$index] = $object;
+        }
+
         return $contents;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function storeMiss($path)
+    {
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/tests/FilesystemTests.php b/tests/FilesystemTests.php
@@ -390,6 +390,7 @@ public function testNoop()
         $filesystem->write('test.txt', 'contents');
         $this->assertTrue($filesystem->has('test.txt'));
         $this->assertInternalType('array', $filesystem->listContents());
+        $this->assertInternalType('array', $filesystem->listContents('', true));
         $cache = $filesystem->getCache();
         $cache->setComplete('', false);
         $cache->flush();
@@ -403,6 +404,10 @@ public function testNoop()
         $this->assertFalse($cache->getVisibility('something'));
         $this->assertFalse($cache->listContents('', false));
         $filesystem->delete('test.txt');
+
+        $this->assertEquals(array(), $cache->storeContents('unknwon', array(
+            array('path' => 'some/file.txt'),
+        ), false));
     }
 
     /**