Fixing redis cachekey

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

diff --git a/src/Core/Config.php b/src/Core/Config.php
index 6ceb637701a251506c4d32a09b9d52af2edcfa55..4bf9c5b11d2d4aa96495516edfc38dc94c098f25 100644 (file)
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -8,10 +8,6 @@
  */
 namespace Friendica\Core;
 
-use Friendica\Core\Config\ConfigCache;
-use Friendica\Core\Config\IConfigAdapter;
-use Friendica\Core\Config\IConfigCache;
-
 /**
  * @brief Arbitrary system configuration storage
  *
@@ -22,117 +18,76 @@ use Friendica\Core\Config\IConfigCache;
 class Config
 {
        /**
-        * @var Config\IConfigAdapter
+        * @var Config\Configuration
         */
-       private static $adapter;
+       private static $config;
 
        /**
-        * @var Config\IConfigCache
-        */
-       private static $cache;
-
-       /**
-        * Initialize the config with only the cache
+        * Initialize the config
         *
-        * @param Config\IConfigCache $cache  The configuration cache
+        * @param Config\Configuration $config
         */
-       public static function init(Config\IConfigCache $cache)
+       public static function init(Config\Configuration $config)
        {
-               self::$cache  = $cache;
-       }
-
-       /**
-        * Add the adapter for DB-backend
-        *
-        * @param Config\IConfigAdapter $adapter
-        */
-       public static function setAdapter(Config\IConfigAdapter $adapter)
-       {
-               self::$adapter = $adapter;
+               self::$config = $config;
        }
 
        /**
         * @brief Loads all configuration values of family into a cached storage.
         *
-        * All configuration values of the system are stored in the cache ( @see IConfigCache )
-        *
-        * @param string $family The category of the configuration value
+        * @param string $cat The category of the configuration value
         *
         * @return void
         */
-       public static function load($family = "config")
+       public static function load($cat = "config")
        {
-               if (!isset(self::$adapter)) {
-                       return;
-               }
-
-               self::$adapter->load($family);
+               self::$config->load($cat);
        }
 
        /**
         * @brief Get a particular user's config variable given the category name
         * ($family) and a key.
         *
-        * Get a particular config value from the given category ($family)
-        * and the $key from a cached storage either from the self::$adapter
-        * (@see IConfigAdapter ) or from the static::$cache (@see IConfigCache ).
-        *
-        * @param string  $family        The category of the configuration value
+        * @param string  $cat        The category of the configuration value
         * @param string  $key           The configuration key to query
         * @param mixed   $default_value optional, The value to return if key is not set (default: null)
         * @param boolean $refresh       optional, If true the config is loaded from the db and not from the cache (default: false)
         *
         * @return mixed Stored value or null if it does not exist
         */
-       public static function get($family, $key, $default_value = null, $refresh = false)
+       public static function get($cat, $key, $default_value = null, $refresh = false)
        {
-               if (!isset(self::$adapter)) {
-                       return self::$cache->get($family, $key, $default_value);
-               }
-
-               return self::$adapter->get($family, $key, $default_value, $refresh);
+               return self::$config->get($cat, $key, $default_value, $refresh);
        }
 
        /**
         * @brief Sets a configuration value for system config
         *
-        * Stores a config value ($value) in the category ($family) under the key ($key)
+        * Stores a config value ($value) in the category ($cat) under the key ($key)
         *
         * Note: Please do not store booleans - convert to 0/1 integer values!
         *
-        * @param string $family The category of the configuration value
+        * @param string $cat The category of the configuration value
         * @param string $key    The configuration key to set
         * @param mixed  $value  The value to store
         *
         * @return bool Operation success
         */
-       public static function set($family, $key, $value)
+       public static function set($cat, $key, $value)
        {
-               if (!isset(self::$adapter)) {
-                       self::$cache->set($family, $key, $value);
-                       return true;
-               }
-
-               return self::$adapter->set($family, $key, $value);
+               return self::$config->set($cat, $key, $value);
        }
 
        /**
         * @brief Deletes the given key from the system configuration.
         *
-        * Removes the configured value from the stored cache in self::$config
-        * (@see ConfigCache ) and removes it from the database (@see IConfigAdapter ).
-        *
-        * @param string $family The category of the configuration value
+        * @param string $cat The category of the configuration value
         * @param string $key    The configuration key to delete
         *
-        * @return mixed
+        * @return bool
         */
-       public static function delete($family, $key)
+       public static function delete($cat, $key)
        {
-               if (!isset(self::$adapter)) {
-                       self::$cache->delete($family, $key);
-               }
-
-               return self::$adapter->delete($family, $key);
+               return self::$config->delete($cat, $key);
        }
 }