Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 19:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updating type-hints and some naming conventions

Browse source
This commit is contained in:
Philipp Holzer 2019-02-04 09:30:48 +01:00
parent 1c51d7d22f
commit d78ac57514
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
9 changed files with 74 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Core/Config/JITConfigAdapter.php
View file

@ -18,14 +18,14 @@ class JITConfigAdapter implements IConfigAdapter
/**
* @var IConfigCache The config cache of this driver
*/
private $config;
private $configCache;
/**
* @param IConfigCache $config The config cache of this driver
* @param IConfigCache $configCache The config cache of this driver
*/
public function __construct($config)
public function __construct(IConfigCache $configCache)
{
$this->config = $config;
$this->configCache = $configCache;
}
public function load($cat = "config")
@ -40,7 +40,7 @@ class JITConfigAdapter implements IConfigAdapter
while ($config = DBA::fetch($configs)) {
$k = $config['k'];
$this->config->set($cat, $k, $config['v']);
$this->configCache->set($cat, $k, $config['v']);
if ($cat !== 'config') {
$this->cache[$cat][$k] = $config['v'];
@ -72,18 +72,18 @@ class JITConfigAdapter implements IConfigAdapter
$this->cache[$cat][$k] = $value;
$this->in_db[$cat][$k] = true;
return $value;
} elseif ($this->config->get($cat, $k) !== null) {
} elseif ($this->configCache->get($cat, $k) !== null) {
// Assign the value (mostly) from config/local.config.php file to the cache
$this->cache[$cat][$k] = $this->config->get($cat, $k);
$this->cache[$cat][$k] = $this->configCache->get($cat, $k);
$this->in_db[$cat][$k] = false;
return $this->config->get($cat, $k);
} elseif ($this->config->get('config', $k) !== null) {
return $this->configCache->get($cat, $k);
} elseif ($this->configCache->get('config', $k) !== null) {
// Assign the value (mostly) from config/local.config.php file to the cache
$this->cache[$k] = $this->config->get('config', $k);
$this->cache[$k] = $this->configCache->get('config', $k);
$this->in_db[$k] = false;
return $this->config->get('config', $k);
return $this->configCache->get('config', $k);
}
$this->cache[$cat][$k] = '!<unset>!';
@ -112,7 +112,7 @@ class JITConfigAdapter implements IConfigAdapter
return true;
}
$this->config->set($cat, $k, $value);
$this->configCache->set($cat, $k, $value);
// Assign the just added value to the cache
$this->cache[$cat][$k] = $dbvalue;