Merge pull request #8055 from nupplaphil/task/remove_get_server

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

diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index 7b9f6edd2c2ffbefba7e0a5d093ebcfb4433d131..d0a04b9ec16ec805bddd0dca4e14a124a9b783e4 100644 (file)
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -4,66 +4,44 @@
  */
 namespace Friendica\Core;
 
-use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Core\Cache\Cache as CacheClass;
+use Friendica\DI;
 
 /**
  * @brief Class for storing data for a short time
  */
-class Cache extends \Friendica\BaseObject
+class Cache
 {
-       const MONTH        = 2592000;
-       const WEEK         = 604800;
-       const DAY          = 86400;
-       const HOUR         = 3600;
-       const HALF_HOUR    = 1800;
-       const QUARTER_HOUR = 900;
-       const FIVE_MINUTES = 300;
-       const MINUTE       = 60;
-
-       /**
-        * @var Cache\ICacheDriver
-        */
-       private static $driver       = null;
-       public  static $driver_class = null;
-       public  static $driver_name  = null;
-
-       public static function init()
-       {
-               self::$driver_name  = Config::get('system', 'cache_driver', 'database');
-               self::$driver       = CacheDriverFactory::create(self::$driver_name);
-               self::$driver_class = get_class(self::$driver);
-       }
-
-       /**
-        * Returns the current cache driver
-        *
-        * @return Cache\ICacheDriver
-        */
-       private static function getDriver()
-       {
-               if (self::$driver === null) {
-                       self::init();
-               }
-
-               return self::$driver;
-       }
+       /** @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 Returns all the cache keys sorted alphabetically
         *
         * @param string $prefix Prefix of the keys (optional)
         *
-        * @return array|null Null if the driver doesn't support this feature
+        * @return array Empty if the driver doesn't support this feature
+        * @throws \Exception
         */
        public static function getAllKeys($prefix = null)
        {
-               $time = microtime(true);
-
-               $return = self::getDriver()->getAllKeys($prefix);
-
-               self::getApp()->save_timestamp($time, 'cache');
-
-               return $return;
+               return DI::cache()->getAllKeys($prefix);
        }
 
        /**
@@ -72,16 +50,11 @@ class Cache extends \Friendica\BaseObject
         * @param string $key The key to the cached data
         *
         * @return mixed Cached $value or "null" if not found
+        * @throws \Exception
         */
        public static function get($key)
        {
-               $time = microtime(true);
-
-               $return = self::getDriver()->get($key);
-
-               self::getApp()->save_timestamp($time, 'cache');
-
-               return $return;
+               return DI::cache()->get($key);
        }
 
        /**
@@ -94,16 +67,11 @@ class Cache extends \Friendica\BaseObject
         * @param integer $duration The cache lifespan
         *
         * @return bool
+        * @throws \Exception
         */
-       public static function set($key, $value, $duration = self::MONTH)
+       public static function set($key, $value, $duration = CacheClass::MONTH)
        {
-               $time = microtime(true);
-
-               $return = self::getDriver()->set($key, $value, $duration);
-
-               self::getApp()->save_timestamp($time, 'cache_write');
-
-               return $return;
+               return DI::cache()->set($key, $value, $duration);
        }
 
        /**
@@ -112,16 +80,11 @@ class Cache extends \Friendica\BaseObject
         * @param string $key The key to the cached data
         *
         * @return bool
+        * @throws \Exception
         */
        public static function delete($key)
        {
-               $time = microtime(true);
-
-               $return = self::getDriver()->delete($key);
-
-               self::getApp()->save_timestamp($time, 'cache_write');
-
-               return $return;
+               return DI::cache()->delete($key);
        }
 
        /**
@@ -129,10 +92,11 @@ class Cache extends \Friendica\BaseObject
         *
         * @param boolean $outdated just remove outdated values
         *
-        * @return void
+        * @return bool
+        * @throws \Exception
         */
        public static function clear($outdated = true)
        {
-               return self::getDriver()->clear($outdated);
+               return DI::cache()->clear($outdated);
        }
 }