Move Cache::clear() to DI::cache()->clear()

[friendica.git] / src / Core / Cache.php

diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index e469dcba1089115c101a6409bd5d44642c5bc372..3e8a3f00475656a6c560e32a8cc1d5398cf11f53 100644 (file)
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -4,45 +4,32 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
-use Friendica\Core\Cache\ICache;
+use Friendica\Core\Cache\Cache as CacheClass;
+use Friendica\DI;
 
 /**
  * @brief Class for storing data for a short time
  */
-class Cache extends BaseObject
+class Cache
 {
-       /** @deprecated Use ICache::MONTH */
-       const MONTH        = ICache::MONTH;
-       /** @deprecated Use ICache::WEEK */
-       const WEEK         = ICache::WEEK;
-       /** @deprecated Use ICache::DAY */
-       const DAY          = ICache::DAY;
-       /** @deprecated Use ICache::HOUR */
-       const HOUR         = ICache::HOUR;
-       /** @deprecated Use ICache::HALF_HOUR */
-       const HALF_HOUR    = ICache::HALF_HOUR;
-       /** @deprecated Use ICache::QUARTER_HOUR */
-       const QUARTER_HOUR = ICache::QUARTER_HOUR;
-       /** @deprecated Use ICache::FIVE_MINUTES */
-       const FIVE_MINUTES = ICache::FIVE_MINUTES;
-       /** @deprecated Use ICache::MINUTE */
-       const MINUTE       = ICache::MINUTE;
-       /** @deprecated Use ICache::INFINITE */
-       const INFINITE     = ICache::INFINITE;
-
-       /**
-        * @brief Returns all the cache keys sorted alphabetically
-        *
-        * @param string $prefix Prefix of the keys (optional)
-        *
-        * @return array Empty if the driver doesn't support this feature
-        * @throws \Exception
-        */
-       public static function getAllKeys($prefix = null)
-       {
-               return self::getClass(ICache::class)->getAllKeys($prefix);
-       }
+       /** @deprecated Use CacheClass::MONTH */
+       const MONTH        = CacheClass::MONTH;
+       /** @deprecated Use CacheClass::WEEK */
+       const WEEK         = CacheClass::WEEK;
+       /** @deprecated Use CacheClass::DAY */
+       const DAY          = CacheClass::DAY;
+       /** @deprecated Use CacheClass::HOUR */
+       const HOUR         = CacheClass::HOUR;
+       /** @deprecated Use CacheClass::HALF_HOUR */
+       const HALF_HOUR    = CacheClass::HALF_HOUR;
+       /** @deprecated Use CacheClass::QUARTER_HOUR */
+       const QUARTER_HOUR = CacheClass::QUARTER_HOUR;
+       /** @deprecated Use CacheClass::FIVE_MINUTES */
+       const FIVE_MINUTES = CacheClass::FIVE_MINUTES;
+       /** @deprecated Use CacheClass::MINUTE */
+       const MINUTE       = CacheClass::MINUTE;
+       /** @deprecated Use CacheClass::INFINITE */
+       const INFINITE     = CacheClass::INFINITE;
 
        /**
         * @brief Fetch cached data according to the key
@@ -54,7 +41,7 @@ class Cache extends BaseObject
         */
        public static function get($key)
        {
-               return self::getClass(ICache::class)->get($key);
+               return DI::cache()->get($key);
        }
 
        /**
@@ -69,9 +56,9 @@ class Cache extends BaseObject
         * @return bool
         * @throws \Exception
         */
-       public static function set($key, $value, $duration = ICache::MONTH)
+       public static function set($key, $value, $duration = CacheClass::MONTH)
        {
-               return self::getClass(ICache::class)->set($key, $value, $duration);
+               return DI::cache()->set($key, $value, $duration);
        }
 
        /**
@@ -84,19 +71,6 @@ class Cache extends BaseObject
         */
        public static function delete($key)
        {
-               return self::getClass(ICache::class)->delete($key);
-       }
-
-       /**
-        * @brief Remove outdated data from the cache
-        *
-        * @param boolean $outdated just remove outdated values
-        *
-        * @return bool
-        * @throws \Exception
-        */
-       public static function clear($outdated = true)
-       {
-               return self::getClass(ICache::class)->clear($outdated);
+               return DI::cache()->delete($key);
        }
 }