[Cache] fixed TagAwareAdapter returning invalid cache
This commit is contained in:
parent
fefb2ff020
commit
946f0a1e11
@ -156,7 +156,12 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
|
|||||||
if (!$this->pool->hasItem($key)) {
|
if (!$this->pool->hasItem($key)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!$itemTags = $this->pool->getItem(static::TAGS_PREFIX.$key)->get()) {
|
|
||||||
|
if (!($itemTags = $this->pool->getItem(static::TAGS_PREFIX.$key))->isHit()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$itemTags = $itemTags->get()) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -296,7 +301,10 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
|
|||||||
}
|
}
|
||||||
|
|
||||||
unset($tagKeys[$key]);
|
unset($tagKeys[$key]);
|
||||||
$itemTags[$key] = $item->get() ?: [];
|
|
||||||
|
if ($item->isHit()) {
|
||||||
|
$itemTags[$key] = $item->get() ?: [];
|
||||||
|
}
|
||||||
|
|
||||||
if (!$tagKeys) {
|
if (!$tagKeys) {
|
||||||
$tagVersions = $this->getTagVersions($itemTags);
|
$tagVersions = $this->getTagVersions($itemTags);
|
||||||
|
@ -194,6 +194,84 @@ class TagAwareAdapterTest extends AdapterTestCase
|
|||||||
$this->assertTrue($pool->getItem('foo')->isHit());
|
$this->assertTrue($pool->getItem('foo')->isHit());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testTagEntryIsCreatedForItemWithoutTags()
|
||||||
|
{
|
||||||
|
$pool = $this->createCachePool();
|
||||||
|
|
||||||
|
$itemKey = 'foo';
|
||||||
|
$item = $pool->getItem($itemKey);
|
||||||
|
$pool->save($item);
|
||||||
|
|
||||||
|
$adapter = new FilesystemAdapter();
|
||||||
|
$this->assertTrue($adapter->hasItem(TagAwareAdapter::TAGS_PREFIX.$itemKey));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testHasItemReturnsFalseWhenPoolDoesNotHaveItemTags()
|
||||||
|
{
|
||||||
|
$pool = $this->createCachePool();
|
||||||
|
|
||||||
|
$itemKey = 'foo';
|
||||||
|
$item = $pool->getItem($itemKey);
|
||||||
|
$pool->save($item);
|
||||||
|
|
||||||
|
$anotherPool = $this->createCachePool();
|
||||||
|
|
||||||
|
$adapter = new FilesystemAdapter();
|
||||||
|
$adapter->deleteItem(TagAwareAdapter::TAGS_PREFIX.$itemKey); //simulate item losing tags pair
|
||||||
|
|
||||||
|
$this->assertFalse($anotherPool->hasItem($itemKey));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetItemReturnsCacheMissWhenPoolDoesNotHaveItemTags()
|
||||||
|
{
|
||||||
|
$pool = $this->createCachePool();
|
||||||
|
|
||||||
|
$itemKey = 'foo';
|
||||||
|
$item = $pool->getItem($itemKey);
|
||||||
|
$pool->save($item);
|
||||||
|
|
||||||
|
$anotherPool = $this->createCachePool();
|
||||||
|
|
||||||
|
$adapter = new FilesystemAdapter();
|
||||||
|
$adapter->deleteItem(TagAwareAdapter::TAGS_PREFIX.$itemKey); //simulate item losing tags pair
|
||||||
|
|
||||||
|
$item = $anotherPool->getItem($itemKey);
|
||||||
|
$this->assertFalse($item->isHit());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testHasItemReturnsFalseWhenPoolDoesNotHaveItemAndOnlyHasTags()
|
||||||
|
{
|
||||||
|
$pool = $this->createCachePool();
|
||||||
|
|
||||||
|
$itemKey = 'foo';
|
||||||
|
$item = $pool->getItem($itemKey);
|
||||||
|
$pool->save($item);
|
||||||
|
|
||||||
|
$anotherPool = $this->createCachePool();
|
||||||
|
|
||||||
|
$adapter = new FilesystemAdapter();
|
||||||
|
$adapter->deleteItem($itemKey); //simulate losing item but keeping tags
|
||||||
|
|
||||||
|
$this->assertFalse($anotherPool->hasItem($itemKey));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetItemReturnsCacheMissWhenPoolDoesNotHaveItemAndOnlyHasTags()
|
||||||
|
{
|
||||||
|
$pool = $this->createCachePool();
|
||||||
|
|
||||||
|
$itemKey = 'foo';
|
||||||
|
$item = $pool->getItem($itemKey);
|
||||||
|
$pool->save($item);
|
||||||
|
|
||||||
|
$anotherPool = $this->createCachePool();
|
||||||
|
|
||||||
|
$adapter = new FilesystemAdapter();
|
||||||
|
$adapter->deleteItem($itemKey); //simulate losing item but keeping tags
|
||||||
|
|
||||||
|
$item = $anotherPool->getItem($itemKey);
|
||||||
|
$this->assertFalse($item->isHit());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return MockObject|PruneableCacheInterface
|
* @return MockObject|PruneableCacheInterface
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user