Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 07:04:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactor ConfigMockTrait to mocked ConfigCache

Browse source
This commit is contained in:
Philipp Holzer 2019-02-07 20:44:03 +01:00
parent 38ac615ba0
commit cb791024e4
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
27 changed files with 244 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Core/Config.php
View file

@ -22,7 +22,7 @@ use Friendica\Core\Config\IConfigCache;
class Config
{
/**
* @var Config\IConfigAdapter
* @var Config\IConfigAdapter|null
*/
private static $adapter;
@ -62,7 +62,7 @@ class Config
*/
public static function load($family = "config")
{
if (!isset(self::$adapter)) {
if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
return;
}
@ -86,7 +86,7 @@ class Config
*/
public static function get($family, $key, $default_value = null, $refresh = false)
{
if (!isset(self::$adapter)) {
if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
return self::$cache->get($family, $key, $default_value);
}
@ -108,9 +108,8 @@ class Config
*/
public static function set($family, $key, $value)
{
if (!isset(self::$adapter)) {
self::$cache->set($family, $key, $value);
return true;
if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
return self::$cache->set($family, $key, $value);
}
return self::$adapter->set($family, $key, $value);
@ -129,7 +128,7 @@ class Config
*/
public static function delete($family, $key)
{
if (!isset(self::$adapter)) {
if (!isset(self::$adapter) || !self::$adapter->isConnected()) {
self::$cache->delete($family, $key);
}