Remove deprecated App::getHostName() - process methods to DI::baseUrl()->getHostName()

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

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index 2f7bd926f4adff4b18f006de1fbe78a2e1036b39..06b0140097697538226f58341e1c17d859d6e683 100644 (file)
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -8,10 +8,7 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
-use Friendica\Core\Config;
-
-require_once 'include/dba.php';
+use Friendica\DI;
 
 /**
  * @brief Management of user configuration storage
@@ -20,108 +17,64 @@ require_once 'include/dba.php';
  * The PConfig::get() functions return boolean false for keys that are unset,
  * and this could lead to subtle bugs.
  */
-class PConfig extends BaseObject
+class PConfig
 {
-       /**
-        * @var Friendica\Core\Config\IPConfigAdapter
-        */
-       private static $adapter = null;
-
-       public static function init($uid)
-       {
-               if (Config::get('system', 'config_adapter') == 'preload') {
-                       self::$adapter = new Config\PreloadPConfigAdapter($uid);
-               } else {
-                       self::$adapter = new Config\JITPConfigAdapter($uid);
-               }
-       }
-
        /**
         * @brief Loads all configuration values of a user's config family into a cached storage.
         *
-        * All configuration values of the given user are stored in global cache
-        * which is available under the global variable $a->config[$uid].
-        *
-        * @param string $uid    The user_id
-        * @param string $family The category of the configuration value
+        * @param int    $uid The user_id
+        * @param string $cat The category of the configuration value
         *
         * @return void
         */
-       public static function load($uid, $family)
+       public static function load(int $uid, string $cat)
        {
-               if (empty(self::$adapter)) {
-                       self::init($uid);
-               }
-
-               self::$adapter->load($uid, $family);
+               DI::pConfig()->load($uid, $cat);
        }
 
        /**
         * @brief Get a particular user's config variable given the category name
-        * ($family) and a key.
-        *
-        * Get a particular user's config value from the given category ($family)
-        * and the $key from a cached storage in $a->config[$uid].
+        * ($cat) and a key.
         *
-        * @param string  $uid           The user_id
-        * @param string  $family        The category of the configuration value
+        * @param int     $uid           The user_id
+        * @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($uid, $family, $key, $default_value = null, $refresh = false)
+       public static function get(int $uid, string $cat, string $key, $default_value = null, bool $refresh = false)
        {
-               if (empty(self::$adapter)) {
-                       self::init($uid);
-               }
-
-               return self::$adapter->get($uid, $family, $key, $default_value, $refresh);
+               return DI::pConfig()->get($uid, $cat, $key, $default_value, $refresh);
        }
 
        /**
         * @brief Sets a configuration value for a user
         *
-        * Stores a config value ($value) in the category ($family) under the key ($key)
-        * for the user_id $uid.
-        *
-        * @note Please do not store booleans - convert to 0/1 integer values!
-        *
-        * @param string $uid    The user_id
-        * @param string $family The category of the configuration value
+        * @param int    $uid    The user_id
+        * @param string $cat    The category of the configuration value
         * @param string $key    The configuration key to set
-        * @param string $value  The value to store
+        * @param mixed  $value  The value to store
         *
         * @return bool Operation success
         */
-       public static function set($uid, $family, $key, $value)
+       public static function set(int $uid, string $cat, string $key, $value)
        {
-               if (empty(self::$adapter)) {
-                       self::init($uid);
-               }
-
-               return self::$adapter->set($uid, $family, $key, $value);
+               return DI::pConfig()->set($uid, $cat, $key, $value);
        }
 
        /**
         * @brief Deletes the given key from the users's configuration.
         *
-        * Removes the configured value from the stored cache in $a->config[$uid]
-        * and removes it from the database.
+        * @param int    $uid The user_id
+        * @param string $cat The category of the configuration value
+        * @param string $key The configuration key to delete
         *
-        * @param string $uid    The user_id
-        * @param string $family The category of the configuration value
-        * @param string $key    The configuration key to delete
-        *
-        * @return mixed
+        * @return bool
         */
-       public static function delete($uid, $family, $key)
+       public static function delete(int $uid, string $cat, string $key)
        {
-               if (empty(self::$adapter)) {
-                       self::init($uid);
-               }
-
-               return self::$adapter->delete($uid, $family, $key);
+               return DI::pConfig()->delete($uid, $cat, $key);
        }
 }