bugfixing adapter get() in case of no connection

diff --git a/src/Core/Config/Adapter/IConfigAdapter.php b/src/Core/Config/Adapter/IConfigAdapter.php
index 8223d33672a2bdd72ac1e491d674135e61826aad..21cd9a4b2ab8f184f870af8e55add727b81ee92a 100644 (file)
--- a/src/Core/Config/Adapter/IConfigAdapter.php
+++ b/src/Core/Config/Adapter/IConfigAdapter.php
@@ -9,7 +9,7 @@ namespace Friendica\Core\Config\Adapter;
 interface IConfigAdapter
 {
        /**
-        * Loads all configuration values into a cached storage.
+        * Loads all configuration values and returns the loaded category as an array.
         *
         * @param string  $cat The category of the configuration values to load
         *
@@ -18,7 +18,7 @@ interface IConfigAdapter
        public function load($cat = "config");
 
        /**
-        * Get a particular user's config variable given the category name
+        * Get a particular system-wide config variable given the category name
         * ($family) and a key.
         *
         * @param string  $cat The category of the configuration value
@@ -60,7 +60,7 @@ interface IConfigAdapter
        public function isConnected();
 
        /**
-        * Checks, if a config value ($value) in the category ($cat) is already loaded.
+        * Checks, if a config key ($key) in the category ($cat) is already loaded.
         *
         * @param string $cat The configuration category
         * @param string $key The configuration key

diff --git a/src/Core/Config/Adapter/IPConfigAdapter.php b/src/Core/Config/Adapter/IPConfigAdapter.php
index e9f389292bc3db411de34bfdf085295d561ef4d4..8e6c050b276d0e22840d07a8c9043b9db29da75f 100644 (file)
--- a/src/Core/Config/Adapter/IPConfigAdapter.php
+++ b/src/Core/Config/Adapter/IPConfigAdapter.php
@@ -15,7 +15,7 @@ namespace Friendica\Core\Config\Adapter;
 interface IPConfigAdapter
 {
        /**
-        * Loads all configuration values of a user's config family into a cached storage.
+        * Loads all configuration values of a user's config family and returns the loaded category as an array.
         *
         * @param string $uid The user_id
         * @param string $cat The category of the configuration value
@@ -71,7 +71,7 @@ interface IPConfigAdapter
        public function isConnected();
 
        /**
-        * Checks, if a config value ($value) in the category ($cat) is already loaded for the user_id $uid.
+        * Checks, if a config key ($key) in the category ($cat) is already loaded for the user_id $uid.
         *
         * @param string $uid The user_id
         * @param string $cat The configuration category

diff --git a/src/Core/Config/Adapter/JITPConfigAdapter.php b/src/Core/Config/Adapter/JITPConfigAdapter.php
index 697e27128ad442d234981b41bdadcc16fc3c186b..c5f3a381ed0044a1f673e90f85e872f6f20a3fe7 100644 (file)
--- a/src/Core/Config/Adapter/JITPConfigAdapter.php
+++ b/src/Core/Config/Adapter/JITPConfigAdapter.php
@@ -49,7 +49,7 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
        public function get($uid, $cat, $key)
        {
                if (!$this->isConnected()) {
-                       return null;
+                       return '!<unset>!';
                }
 
                $pconfig = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $key]);

diff --git a/src/Core/Config/Adapter/PreloadConfigAdapter.php b/src/Core/Config/Adapter/PreloadConfigAdapter.php
index a12c2a7ca63f1f9c4c9c482d58dc33ef72aba1c4..fa691a16d353443ce1630204ab04607807909bd7 100644 (file)
--- a/src/Core/Config/Adapter/PreloadConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadConfigAdapter.php
@@ -47,7 +47,7 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
        public function get($cat, $key)
        {
                if (!$this->isConnected()) {
-                       return null;
+                       return '!<unset>!';
                }
 
                $config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);

diff --git a/src/Core/Config/Adapter/PreloadPConfigAdapter.php b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
index d1c44d9fb674555ec3f7eee024b07bf6b50ef9d9..e79a4a1e3cbb93dbfe09d839b9a2d48bf204487f 100644 (file)
--- a/src/Core/Config/Adapter/PreloadPConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadPConfigAdapter.php
@@ -59,7 +59,7 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
        public function get($uid, $cat, $key)
        {
                if (!$this->isConnected()) {
-                       return null;
+                       return '!<unset>!';
                }
 
                if (!$this->config_loaded) {

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index 67e58ef6b1206140033ba81d0b0ec59c4302a40e..3cb22e1e478aeef78dc2e2467af3fe35523c4771 100644 (file)
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -68,7 +68,7 @@ class Logger extends BaseObject
         *
         * @param LoggerInterface $logger The Logger instance of this Application
         */
-       public static function init($logger)
+       public static function init(LoggerInterface $logger)
        {
                self::$logger = $logger;
        }
@@ -78,7 +78,7 @@ class Logger extends BaseObject
         *
         * @param LoggerInterface $logger The Logger instance of this Application
         */
-       public static function setDevLogger($logger)
+       public static function setDevLogger(LoggerInterface $logger)
        {
                self::$devLogger = $logger;
        }