diff --git a/src/Console/Cache.php b/src/Console/Cache.php index e2a383098..a13e003aa 100644 --- a/src/Console/Cache.php +++ b/src/Console/Cache.php @@ -4,6 +4,7 @@ namespace Friendica\Console; use Asika\SimpleConsole\CommandArgsException; use Friendica\App; +use Friendica\Core\Cache\Cache as CacheClass; use Friendica\Core\Cache\ICache; use RuntimeException; @@ -153,7 +154,7 @@ HELP; if (count($this->args) >= 3) { $key = $this->getArgument(1); $value = $this->getArgument(2); - $duration = intval($this->getArgument(3, ICache::FIVE_MINUTES)); + $duration = intval($this->getArgument(3, CacheClass::FIVE_MINUTES)); if (is_array($this->cache->get($key))) { throw new RuntimeException("$key is an array and can't be set using this command."); diff --git a/src/Core/Cache/IMemoryCache.php b/src/Core/Cache/IMemoryCache.php index 939e54574..339f72d04 100644 --- a/src/Core/Cache/IMemoryCache.php +++ b/src/Core/Cache/IMemoryCache.php @@ -19,7 +19,7 @@ interface IMemoryCache extends ICache * @param int $ttl The cache lifespan, must be one of the Cache constants * @return bool */ - public function add($key, $value, $ttl = ICache::FIVE_MINUTES); + public function add($key, $value, $ttl = Cache::FIVE_MINUTES); /** * Compares if the old value is set and sets the new value @@ -31,7 +31,7 @@ interface IMemoryCache extends ICache * * @return bool */ - public function compareSet($key, $oldValue, $newValue, $ttl = ICache::FIVE_MINUTES); + public function compareSet($key, $oldValue, $newValue, $ttl = Cache::FIVE_MINUTES); /** * Compares if the old value is set and removes it diff --git a/src/Core/Lock.php b/src/Core/Lock.php index 06313fdd2..ef62bc8f7 100644 --- a/src/Core/Lock.php +++ b/src/Core/Lock.php @@ -8,7 +8,7 @@ namespace Friendica\Core; use Friendica\BaseObject; -use Friendica\Core\Cache\ICache; +use Friendica\Core\Cache\Cache; use Friendica\Core\Lock\ILock; /** @@ -26,7 +26,7 @@ class Lock extends BaseObject * @return boolean Was the lock successful? * @throws \Exception */ - public static function acquire($key, $timeout = 120, $ttl = ICache::FIVE_MINUTES) + public static function acquire($key, $timeout = 120, $ttl = Cache::FIVE_MINUTES) { return self::getClass(ILock::class)->acquireLock($key, $timeout, $ttl); } diff --git a/src/Core/Lock/ILock.php b/src/Core/Lock/ILock.php index 3c56369eb..0b91daeb5 100644 --- a/src/Core/Lock/ILock.php +++ b/src/Core/Lock/ILock.php @@ -30,7 +30,7 @@ interface ILock * * @return boolean Was the lock successful? */ - public function acquireLock($key, $timeout = 120, $ttl = Cache\ICache::FIVE_MINUTES); + public function acquireLock($key, $timeout = 120, $ttl = Cache\Cache::FIVE_MINUTES); /** * Releases a lock if it was set by us