class Configuration
{
/**
- * @var Cache\IConfigCache
+ * @var Cache\ConfigCache
*/
private $configCache;
private $configAdapter;
/**
- * @param Cache\IConfigCache $configCache The configuration cache (based on the config-files)
+ * @param Cache\ConfigCache $configCache The configuration cache (based on the config-files)
* @param Adapter\IConfigAdapter $configAdapter The configuration DB-backend
*/
- public function __construct(Cache\IConfigCache $configCache, Adapter\IConfigAdapter $configAdapter)
+ public function __construct(Cache\ConfigCache $configCache, Adapter\IConfigAdapter $configAdapter)
{
$this->configCache = $configCache;
$this->configAdapter = $configAdapter;
/**
* Returns the Config Cache
*
- * @return Cache\IConfigCache
+ * @return Cache\ConfigCache
*/
public function getCache()
{
if ($this->configAdapter->isConnected() &&
(!$this->configAdapter->isLoaded($cat, $key) ||
$refresh)) {
+
$dbvalue = $this->configAdapter->get($cat, $key);
- if ($dbvalue !== '!<unset>!') {
+ if (isset($dbvalue)) {
$this->configCache->set($cat, $key, $dbvalue);
- return $dbvalue;
+ unset($dbvalue);
}
}
// use the config cache for return
- if ($this->configCache->has($cat, $key)) {
- return $this->configCache->get($cat, $key);
- } else {
- return $default_value;
- }
+ $result = $this->configCache->get($cat, $key);
+
+ return (isset($result)) ? $result : $default_value;
}
/**