Merge branch 'cache-fix-15578' of https://github.com/aedart/framework …

…into aedart-cache-fix-15578
laravel · Oct 12, 2016 · 96dfbff · 96dfbff
2 parents 2e91104 + ddc3714
commit 96dfbff
Show file tree

Hide file tree

Showing 15 changed files with 73 additions and 21 deletions.
diff --git a/src/Illuminate/Cache/ApcStore.php b/src/Illuminate/Cache/ApcStore.php
@@ -113,11 +113,11 @@ public function forget($key)
     /**
      * Remove all items from the cache.
      *
-     * @return void
+     * @return bool
      */
     public function flush()
     {
-        $this->apc->flush();
+        return $this->apc->flush();
     }
 
     /**

diff --git a/src/Illuminate/Cache/ApcWrapper.php b/src/Illuminate/Cache/ApcWrapper.php
@@ -83,10 +83,10 @@ public function delete($key)
     /**
      * Remove all items from the cache.
      *
-     * @return void
+     * @return bool
      */
     public function flush()
     {
-        $this->apcu ? apcu_clear_cache() : apc_clear_cache('user');
+        return $this->apcu ? apcu_clear_cache() : apc_clear_cache('user');
     }
 }
diff --git a/src/Illuminate/Cache/ArrayStore.php b/src/Illuminate/Cache/ArrayStore.php
@@ -95,11 +95,12 @@ public function forget($key)
     /**
      * Remove all items from the cache.
      *
-     * @return void
+     * @return bool
      */
     public function flush()
     {
         $this->storage = [];
+        return true;
     }
 
     /**

diff --git a/src/Illuminate/Cache/DatabaseStore.php b/src/Illuminate/Cache/DatabaseStore.php
@@ -218,11 +218,11 @@ public function forget($key)
     /**
      * Remove all items from the cache.
      *
-     * @return void
+     * @return bool
      */
     public function flush()
     {
-        $this->table()->delete();
+        return (bool) $this->table()->delete();
     }
 
     /**

diff --git a/src/Illuminate/Cache/FileStore.php b/src/Illuminate/Cache/FileStore.php
@@ -182,15 +182,19 @@ public function forget($key)
     /**
      * Remove all items from the cache.
      *
-     * @return void
+     * @return bool
      */
     public function flush()
     {
         if ($this->files->isDirectory($this->directory)) {
             foreach ($this->files->directories($this->directory) as $directory) {
-                $this->files->deleteDirectory($directory);
+                if(!$this->files->deleteDirectory($directory)){
+                    return false;
+                }
             }
+            return true;
         }
+        return false;
     }
 
     /**

diff --git a/src/Illuminate/Cache/MemcachedStore.php b/src/Illuminate/Cache/MemcachedStore.php
@@ -184,11 +184,11 @@ public function forget($key)
     /**
      * Remove all items from the cache.
      *
-     * @return void
+     * @return bool
      */
     public function flush()
     {
-        $this->memcached->flush();
+        return $this->memcached->flush();
     }
 
     /**

diff --git a/src/Illuminate/Cache/NullStore.php b/src/Illuminate/Cache/NullStore.php
@@ -89,7 +89,7 @@ public function forget($key)
     /**
      * Remove all items from the cache.
      *
-     * @return void
+     * @return bool
      */
     public function flush()
     {

diff --git a/src/Illuminate/Cache/RedisStore.php b/src/Illuminate/Cache/RedisStore.php
@@ -166,11 +166,11 @@ public function forget($key)
     /**
      * Remove all items from the cache.
      *
-     * @return void
+     * @return bool
      */
     public function flush()
     {
-        $this->connection()->flushdb();
+        return (bool) $this->connection()->flushdb();
     }
 
     /**

diff --git a/src/Illuminate/Contracts/Cache/Store.php b/src/Illuminate/Contracts/Cache/Store.php
@@ -79,7 +79,7 @@ public function forget($key);
     /**
      * Remove all items from the cache.
      *
-     * @return void
+     * @return bool
      */
     public function flush();
 

diff --git a/tests/Cache/CacheApcStoreTest.php b/tests/Cache/CacheApcStoreTest.php
@@ -91,4 +91,13 @@ public function testForgetMethodProperlyCallsAPC()
         $store = new Illuminate\Cache\ApcStore($apc);
         $store->forget('foo');
     }
+
+    public function testFlushesCached()
+    {
+        $apc = $this->getMockBuilder('Illuminate\Cache\ApcWrapper')->setMethods(['flush'])->getMock();
+        $apc->expects($this->once())->method('flush')->willReturn(true);
+        $store = new Illuminate\Cache\ApcStore($apc);
+        $result = $store->flush();
+        $this->assertTrue($result);
+    }
 }
diff --git a/tests/Cache/CacheArrayStoreTest.php b/tests/Cache/CacheArrayStoreTest.php
@@ -63,7 +63,8 @@ public function testItemsCanBeFlushed()
         $store = new ArrayStore;
         $store->put('foo', 'bar', 10);
         $store->put('baz', 'boom', 10);
-        $store->flush();
+        $result = $store->flush();
+        $this->assertTrue($result);
         $this->assertNull($store->get('foo'));
         $this->assertNull($store->get('baz'));
     }

diff --git a/tests/Cache/CacheDatabaseStoreTest.php b/tests/Cache/CacheDatabaseStoreTest.php
@@ -96,9 +96,10 @@ public function testItemsMayBeFlushedFromCache()
         $store = $this->getStore();
         $table = m::mock('StdClass');
         $store->getConnection()->shouldReceive('table')->once()->with('table')->andReturn($table);
-        $table->shouldReceive('delete')->once();
+        $table->shouldReceive('delete')->once()->andReturn(2);
 
-        $store->flush();
+        $result = $store->flush();
+        $this->assertTrue($result);
     }
 
     public function testIncrementReturnsCorrectValues()

diff --git a/tests/Cache/CacheFileStoreTest.php b/tests/Cache/CacheFileStoreTest.php
@@ -120,10 +120,23 @@ public function testFlushCleansDirectory()
         $files = $this->mockFilesystem();
         $files->expects($this->once())->method('isDirectory')->with($this->equalTo(__DIR__))->will($this->returnValue(true));
         $files->expects($this->once())->method('directories')->with($this->equalTo(__DIR__))->will($this->returnValue(['foo']));
-        $files->expects($this->once())->method('deleteDirectory')->with($this->equalTo('foo'));
+        $files->expects($this->once())->method('deleteDirectory')->with($this->equalTo('foo'))->will($this->returnValue(true));
 
         $store = new FileStore($files, __DIR__);
-        $store->flush();
+        $result = $store->flush();
+        $this->assertTrue($result, 'Flush failed');
+    }
+
+    public function testFlushFailsDirectoryClean()
+    {
+        $files = $this->mockFilesystem();
+        $files->expects($this->once())->method('isDirectory')->with($this->equalTo(__DIR__))->will($this->returnValue(true));
+        $files->expects($this->once())->method('directories')->with($this->equalTo(__DIR__))->will($this->returnValue(['foo']));
+        $files->expects($this->once())->method('deleteDirectory')->with($this->equalTo('foo'))->will($this->returnValue(false));
+
+        $store = new FileStore($files, __DIR__);
+        $result = $store->flush();
+        $this->assertFalse($result, 'Flush should not have cleared directories');
     }
 
     public function testFlushIgnoreNonExistingDirectory()
@@ -132,7 +145,8 @@ public function testFlushIgnoreNonExistingDirectory()
         $files->expects($this->once())->method('isDirectory')->with($this->equalTo(__DIR__.'--wrong'))->will($this->returnValue(false));
 
         $store = new FileStore($files, __DIR__.'--wrong');
-        $store->flush();
+        $result = $store->flush();
+        $this->assertFalse($result, 'Flush should not clean directory');
     }
 
     protected function mockFilesystem()

diff --git a/tests/Cache/CacheMemcachedStoreTest.php b/tests/Cache/CacheMemcachedStoreTest.php
@@ -111,6 +111,19 @@ public function testForgetMethodProperlyCallsMemcache()
         $store->forget('foo');
     }
 
+    public function testFlushesCached()
+    {
+        if (! class_exists('Memcached')) {
+            $this->markTestSkipped('Memcached module not installed');
+        }
+
+        $memcache = $this->getMockBuilder('Memcached')->setMethods(['flush'])->getMock();
+        $memcache->expects($this->once())->method('flush')->willReturn(true);
+        $store = new Illuminate\Cache\MemcachedStore($memcache);
+        $result = $store->flush();
+        $this->assertTrue($result);
+    }
+
     public function testGetAndSetPrefix()
     {
         if (! class_exists('Memcached')) {

diff --git a/tests/Cache/CacheRedisStoreTest.php b/tests/Cache/CacheRedisStoreTest.php
@@ -119,6 +119,15 @@ public function testForgetMethodProperlyCallsRedis()
         $redis->forget('foo');
     }
 
+    public function testFlushesCached()
+    {
+        $redis = $this->getRedis();
+        $redis->getRedis()->shouldReceive('connection')->once()->with('default')->andReturn($redis->getRedis());
+        $redis->getRedis()->shouldReceive('flushdb')->once()->andReturn('ok');
+        $result = $redis->flush();
+        $this->assertTrue($result);
+    }
+
     public function testGetAndSetPrefix()
     {
         $redis = $this->getRedis();