Skip to content

Commit 89e01bd

Browse files
committed
Fixed broken build and remove depencency on taggable
1 parent b73cf82 commit 89e01bd

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

HierarchicalCachePoolTrait.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Cache\Hierarchy;
1313

14-
use Cache\Taggable\TaggablePoolInterface;
14+
use Cache\Adapter\Common\AbstractCachePool;
1515

1616
/**
1717
* @author Tobias Nyholm <[email protected]>
@@ -57,7 +57,7 @@ protected function getHierarchyKey($key, &$pathKey = null)
5757
// 1) $keyString = "foo!tagHash"
5858
// 2) $keyString = "foo!tagHash![foo_index]!bar!tagHash"
5959
$keyString .= $name;
60-
$pathKey = sha1('path'.TaggablePoolInterface::TAG_SEPARATOR.$keyString);
60+
$pathKey = sha1('path'.AbstractCachePool::SEPARATOR_TAG.$keyString);
6161

6262
if (isset($this->keyCache[$pathKey])) {
6363
$index = $this->keyCache[$pathKey];
@@ -68,7 +68,7 @@ protected function getHierarchyKey($key, &$pathKey = null)
6868

6969
// 1) $keyString = "foo!tagHash![foo_index]!"
7070
// 2) $keyString = "foo!tagHash![foo_index]!bar!tagHash![bar_index]!"
71-
$keyString .= TaggablePoolInterface::TAG_SEPARATOR.$index.TaggablePoolInterface::TAG_SEPARATOR;
71+
$keyString .= AbstractCachePool::SEPARATOR_TAG.$index.AbstractCachePool::SEPARATOR_TAG;
7272
}
7373

7474
// Assert: $pathKey = "path!foo!tagHash![foo_index]!bar!tagHash"
@@ -108,7 +108,7 @@ private function isHierarchyKey($key)
108108
*/
109109
private function explodeKey($string)
110110
{
111-
list($key, $tag) = explode(TaggablePoolInterface::TAG_SEPARATOR, $string.TaggablePoolInterface::TAG_SEPARATOR);
111+
list($key, $tag) = explode(AbstractCachePool::SEPARATOR_TAG, $string.AbstractCachePool::SEPARATOR_TAG);
112112

113113
if ($key === HierarchicalPoolInterface::HIERARCHY_SEPARATOR) {
114114
$parts = ['root'];
@@ -119,7 +119,7 @@ private function explodeKey($string)
119119
}
120120

121121
return array_map(function ($level) use ($tag) {
122-
return $level.TaggablePoolInterface::TAG_SEPARATOR.$tag;
122+
return $level.AbstractCachePool::SEPARATOR_TAG.$tag;
123123
}, $parts);
124124
}
125125
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"require": {
2626
"php": "^5.5 || ^7.0",
2727
"psr/cache": "^1.0",
28-
"cache/taggable-cache": "^0.4"
28+
"cache/adapter-common": "^0.4"
2929
},
3030
"require-dev": {
3131
"phpunit/phpunit": "^4.0 || ^5.1"

0 commit comments

Comments
 (0)