Fix: write() after clearGroup() does not actually write to file

Although clearGroup() does not use $this->_File, it needs to be null-ed so that subsequent write() call do not see stale object.
cakephp · Apr 26, 2013 · 03e5207 · 03e5207
1 parent 3c036e9
commit 03e5207
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/lib/Cake/Cache/Engine/FileEngine.php b/lib/Cake/Cache/Engine/FileEngine.php
@@ -369,6 +369,7 @@ public function clearGroup($group) {
 				unlink($object->getPathName());
 			}
 		}
+		$this->_File = null;
 		return true;
 	}
 }
diff --git a/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
@@ -411,6 +411,32 @@ public function testGroupsReadWrite() {
 		$this->assertTrue(Cache::write('test_groups3', 'value3', 'file_groups'));
 	}
 
+/**
+ * Test that clearing with repeat writes works properly
+ */
+	public function testClearingWithRepeatWrites() {
+		Cache::config('repeat', array(
+			'engine' => 'File', 'groups' => array('users')
+		));
+
+		$this->assertTrue(Cache::write('user', 'rchavik', 'repeat'));
+		$this->assertEquals('rchavik', Cache::read('user', 'repeat'));
+
+		Cache::delete('user', 'repeat');
+		$this->assertEquals(false, Cache::read('user', 'repeat'));
+
+		$this->assertTrue(Cache::write('user', 'ADmad', 'repeat'));
+		$this->assertEquals('ADmad', Cache::read('user', 'repeat'));
+
+		Cache::clearGroup('users', 'repeat');
+		$this->assertEquals(false, Cache::read('user', 'repeat'));
+
+		$this->assertTrue(Cache::write('user', 'markstory', 'repeat'));
+		$this->assertEquals('markstory', Cache::read('user', 'repeat'));
+
+		Cache::drop('repeat');
+	}
+
 /**
  * Tests that deleting from a groups-enabled config is possible
  *