friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Updating type-hints and some naming conventions

This commit is contained in:
Philipp Holzer 2019-02-04 09:32:13 +01:00
parent d78ac57514
commit f779110154
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Core/Config.php
View File

@ -25,16 +25,16 @@ class Config
/** /**
* @var Config\IConfigCache * @var Config\IConfigCache
*/ */
private static $config; private static $cache;
/** /**
* Initialize the config with only the cache * Initialize the config with only the cache
* *
* @param Config\IConfigCache $config The configuration cache * @param Config\IConfigCache $cache The configuration cache
*/ */
public static function init(Config\IConfigCache $config) public static function init(Config\IConfigCache $cache)
{ {
self::$config = $config; self::$cache = $cache;
} }
/** /**
@ -88,7 +88,7 @@ class Config
public static function get($family, $key, $default_value = null, $refresh = false) public static function get($family, $key, $default_value = null, $refresh = false)
{ {
if (!isset(self::$adapter)) { if (!isset(self::$adapter)) {
return self::$config->get($family, $key, $default_value); return self::$cache->get($family, $key, $default_value);
} }
return self::$adapter->get($family, $key, $default_value, $refresh); return self::$adapter->get($family, $key, $default_value, $refresh);
@ -111,7 +111,7 @@ class Config
public static function set($family, $key, $value) public static function set($family, $key, $value)
{ {
if (!isset(self::$adapter)) { if (!isset(self::$adapter)) {
self::$config->set($family, $key, $value); self::$cache->set($family, $key, $value);
return true; return true;
} }
@ -132,7 +132,7 @@ class Config
public static function delete($family, $key) public static function delete($family, $key)
{ {
if (!isset(self::$adapter)) { if (!isset(self::$adapter)) {
self::$config->delete($family, $key); self::$cache->delete($family, $key);
} }
return self::$adapter->delete($family, $key); return self::$adapter->delete($family, $key);

16
src/Core/PConfig.php
View File

@ -25,16 +25,16 @@ class PConfig
/** /**
* @var Config\IPConfigCache * @var Config\IPConfigCache
*/ */
private static $config; private static $cache;
/** /**
* Initialize the config with only the cache * Initialize the config with only the cache
* *
* @param Config\IPConfigCache $config The configuration cache * @param Config\IPConfigCache $cache The configuration cache
*/ */
public static function init($config) public static function init(Config\IPConfigCache $cache)
{ {
self::$config = $config; self::$cache = $cache;
} }
/** /**
@ -42,7 +42,7 @@ class PConfig
* *
* @param Config\IPConfigAdapter $adapter * @param Config\IPConfigAdapter $adapter
*/ */
public static function setAdapter($adapter) public static function setAdapter(Config\IPConfigAdapter $adapter)
{ {
self::$adapter = $adapter; self::$adapter = $adapter;
} }
@ -85,7 +85,7 @@ class PConfig
public static function get($uid, $family, $key, $default_value = null, $refresh = false) public static function get($uid, $family, $key, $default_value = null, $refresh = false)
{ {
if (!isset(self::$adapter)) { if (!isset(self::$adapter)) {
return self::$config->getP($uid, $family, $key, $default_value); return self::$cache->getP($uid, $family, $key, $default_value);
} }
return self::$adapter->get($uid, $family, $key, $default_value, $refresh); return self::$adapter->get($uid, $family, $key, $default_value, $refresh);
@ -109,7 +109,7 @@ class PConfig
public static function set($uid, $family, $key, $value) public static function set($uid, $family, $key, $value)
{ {
if (!isset(self::$adapter)) { if (!isset(self::$adapter)) {
return self::$config->setP($uid, $family, $key, $value); return self::$cache->setP($uid, $family, $key, $value);
} }
return self::$adapter->set($uid, $family, $key, $value); return self::$adapter->set($uid, $family, $key, $value);
@ -130,7 +130,7 @@ class PConfig
public static function delete($uid, $family, $key) public static function delete($uid, $family, $key)
{ {
if (!isset(self::$adapter)) { if (!isset(self::$adapter)) {
return self::$config->deleteP($uid, $family, $key); return self::$cache->deleteP($uid, $family, $key);
} }
return self::$adapter->delete($uid, $family, $key); return self::$adapter->delete($uid, $family, $key);