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 0c5597aa5e66372e2322f7e683cb1e6c831c092e..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\ICacheDriver;
+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 ICacheDriver::MONTH */
-       const MONTH        = ICacheDriver::MONTH;
-       /** @deprecated Use ICacheDriver::WEEK */
-       const WEEK         = 604800;
-       /** @deprecated Use ICacheDriver::DAY */
-       const DAY          = 86400;
-       /** @deprecated Use ICacheDriver::HOUR */
-       const HOUR         = 3600;
-       /** @deprecated Use ICacheDriver::HALF_HOUR */
-       const HALF_HOUR    = 1800;
-       /** @deprecated Use ICacheDriver::QUARTER_HOUR */
-       const QUARTER_HOUR = 900;
-       /** @deprecated Use ICacheDriver::FIVE_MINUTES */
-       const FIVE_MINUTES = 300;
-       /** @deprecated Use ICacheDriver::MINUTE */
-       const MINUTE       = 60;
-       /** @deprecated Use ICacheDriver::INFINITE */
-       const INFINITE     = 0;
-
-       /**
-        * @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(ICacheDriver::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(ICacheDriver::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 = ICacheDriver::MONTH)
+       public static function set($key, $value, $duration = CacheClass::MONTH)
        {
-               return self::getClass(ICacheDriver::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(ICacheDriver::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(ICacheDriver::class)->clear($outdated);
+               return DI::cache()->delete($key);
        }
 }