Avoid memory issue in exception

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

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index bfa52f5a36ebd7e480d97d2c638ccf8a77b2958e..df024f0f3426dfa84abc665789066a1c6427316a 100644 (file)
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -8,11 +8,6 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
-use Friendica\Core\Config;
-
-require_once 'include/dba.php';
-
 /**
  * @brief Management of user configuration storage
  * Note:
@@ -20,29 +15,43 @@ 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
+        * @var Config\IPConfigAdapter
         */
-       private static $adapter = null;
+       private static $adapter;
 
-       public static function init($uid)
+       /**
+        * @var Config\IPConfigCache
+        */
+       private static $cache;
+
+       /**
+        * Initialize the config with only the cache
+        *
+        * @param Config\IPConfigCache $cache  The configuration cache
+        */
+       public static function init(Config\IPConfigCache $cache)
        {
-               $a = self::getApp();
+               self::$cache  = $cache;
+       }
 
-               if (isset($a->config['system']['config_adapter']) && $a->config['system']['config_adapter'] == 'preload') {
-                       self::$adapter = new Config\PreloadPConfigAdapter($uid);
-               } else {
-                       self::$adapter = new Config\JITPConfigAdapter($uid);
-               }
+       /**
+        * Add the adapter for DB-backend
+        *
+        * @param Config\IPConfigAdapter $adapter
+        */
+       public static function setAdapter(Config\IPConfigAdapter $adapter)
+       {
+               self::$adapter = $adapter;
        }
 
        /**
         * @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].
+        * All configuration values of the given user are stored with the $uid in
+        * the cache ( @see IPConfigCache )
         *
         * @param string $uid    The user_id
         * @param string $family The category of the configuration value
@@ -51,8 +60,8 @@ class PConfig extends BaseObject
         */
        public static function load($uid, $family)
        {
-               if (empty(self::$adapter)) {
-                       self::init($uid);
+               if (!isset(self::$adapter)) {
+                       return;
                }
 
                self::$adapter->load($uid, $family);
@@ -63,7 +72,8 @@ class PConfig extends BaseObject
         * ($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].
+        * and the $key with the $uid from a cached storage either from the self::$adapter
+        * (@see IConfigAdapter ) or from the static::$cache (@see IConfigCache ).
         *
         * @param string  $uid           The user_id
         * @param string  $family        The category of the configuration value
@@ -75,8 +85,8 @@ class PConfig extends BaseObject
         */
        public static function get($uid, $family, $key, $default_value = null, $refresh = false)
        {
-               if (empty(self::$adapter)) {
-                       self::init($uid);
+               if (!isset(self::$adapter)) {
+                       return self::$cache->getP($uid, $family, $key, $default_value);
                }
 
                return self::$adapter->get($uid, $family, $key, $default_value, $refresh);
@@ -88,19 +98,19 @@ class PConfig extends BaseObject
         * 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!
+        * @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 string $key    The configuration key to set
-        * @param string $value  The value to store
+        * @param mixed  $value  The value to store
         *
-        * @return mixed Stored $value or false
+        * @return bool Operation success
         */
        public static function set($uid, $family, $key, $value)
        {
-               if (empty(self::$adapter)) {
-                       self::init($uid);
+               if (!isset(self::$adapter)) {
+                       return self::$cache->setP($uid, $family, $key, $value);
                }
 
                return self::$adapter->set($uid, $family, $key, $value);
@@ -109,8 +119,9 @@ class PConfig extends BaseObject
        /**
         * @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.
+        * Removes the configured value from the stored cache in self::$config
+        * (@see ConfigCache ) and removes it from the database (@see IConfigAdapter )
+        * with the given $uid.
         *
         * @param string $uid    The user_id
         * @param string $family The category of the configuration value
@@ -120,8 +131,8 @@ class PConfig extends BaseObject
         */
        public static function delete($uid, $family, $key)
        {
-               if (empty(self::$adapter)) {
-                       self::init($uid);
+               if (!isset(self::$adapter)) {
+                       return self::$cache->deleteP($uid, $family, $key);
                }
 
                return self::$adapter->delete($uid, $family, $key);