From d91e17b7378d1592877c20a04eb1fd180750887d Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Mon, 11 Jan 2016 23:14:16 +0100 Subject: [PATCH] Bugfix, make sure that getKeyFromTaggedKey() uses the TaggablePoolInterface::TAG_SEPARATOR --- src/TaggableItemTrait.php | 2 +- tests/TaggableItemTraitTest.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/TaggableItemTrait.php b/src/TaggableItemTrait.php index 15cf2c2..807cbd1 100644 --- a/src/TaggableItemTrait.php +++ b/src/TaggableItemTrait.php @@ -38,7 +38,7 @@ public function getTaggedKey() */ protected function getKeyFromTaggedKey($taggedKey) { - if (false === $pos = strpos($taggedKey, ':')) { + if (false === $pos = strpos($taggedKey, TaggablePoolInterface::TAG_SEPARATOR)) { return $taggedKey; } diff --git a/tests/TaggableItemTraitTest.php b/tests/TaggableItemTraitTest.php index 5714907..7866d98 100644 --- a/tests/TaggableItemTraitTest.php +++ b/tests/TaggableItemTraitTest.php @@ -20,10 +20,10 @@ public function testGetKey() $item = new CacheItem('key'); $this->assertEquals('key', $item->getKey()); - $item = new CacheItem('key:foo'); + $item = new CacheItem('key!foo'); $this->assertEquals('key', $item->getKey()); - $item = new CacheItem('key:foo:bar'); + $item = new CacheItem('key!foo!bar'); $this->assertEquals('key', $item->getKey()); } @@ -32,10 +32,10 @@ public function testGetTaggedKey() $item = new CacheItem('key'); $this->assertEquals('key', $item->getTaggedKey()); - $item = new CacheItem('key:foo'); - $this->assertEquals('key:foo', $item->getTaggedKey()); + $item = new CacheItem('key!foo'); + $this->assertEquals('key!foo', $item->getTaggedKey()); - $item = new CacheItem('key:foo:bar'); - $this->assertEquals('key:foo:bar', $item->getTaggedKey()); + $item = new CacheItem('key!foo!bar'); + $this->assertEquals('key!foo!bar', $item->getTaggedKey()); } }