class PConfiguration
{
/**
- * @var Cache\IPConfigCache
+ * @var Cache\PConfigCache
*/
private $configCache;
private $configAdapter;
/**
- * @param Cache\IPConfigCache $configCache The configuration cache
+ * @param Cache\PConfigCache $configCache The configuration cache
* @param Adapter\IPConfigAdapter $configAdapter The configuration DB-backend
*/
- public function __construct(Cache\IPConfigCache $configCache, Adapter\IPConfigAdapter $configAdapter)
+ public function __construct(Cache\PConfigCache $configCache, Adapter\IPConfigAdapter $configAdapter)
{
$this->configCache = $configCache;
$this->configAdapter = $configAdapter;
}
// load the whole category out of the DB into the cache
- $this->configCache->loadP($uid, $this->configAdapter->load($uid, $cat));
+ $this->configCache->load($uid, $this->configAdapter->load($uid, $cat));
}
/**
$refresh)) {
$dbValue = $this->configAdapter->get($uid, $cat, $key);
- if ($dbValue !== '!<unset>!') {
- $this->configCache->setP($uid, $cat, $key, $dbValue);
+ if (isset($dbValue)) {
+ $this->configCache->set($uid, $cat, $key, $dbValue);
+ return $dbValue;
}
}
// use the config cache for return
- if ($this->configCache->hasP($uid, $cat, $key)) {
- return $this->configCache->getP($uid, $cat, $key);
- } else {
- return $default_value;
- }
+ $result = $this->configCache->get($uid, $cat, $key);
+ return (isset($result)) ? $result : $default_value;
}
/**
public function set($uid, $cat, $key, $value)
{
// set the cache first
- $cached = $this->configCache->setP($uid, $cat, $key, $value);
+ $cached = $this->configCache->set($uid, $cat, $key, $value);
// If there is no connected adapter, we're finished
if (!$this->configAdapter->isConnected()) {
*/
public function delete($uid, $cat, $key)
{
- $cacheRemoved = $this->configCache->deleteP($uid, $cat, $key);
+ $cacheRemoved = $this->configCache->delete($uid, $cat, $key);
if (!$this->configAdapter->isConnected()) {
return $cacheRemoved;