[FileCache] Remove 'isPrepareCache'

There is no need to check the absense of the parameters in
all functions. Instead 'getCacheName' is the only function
actually using the parameters and thus should check the
availability.
This commit is contained in:
logmanoriginal 2016-10-08 15:21:10 +02:00
parent ac0a9a90ad
commit d941fa41f6

View file

@ -7,14 +7,11 @@ class FileCache implements CacheInterface {
protected $param; protected $param;
public function loadData(){ public function loadData(){
$this->isPrepareCache();
$datas = unserialize(file_get_contents($this->getCacheFile())); $datas = unserialize(file_get_contents($this->getCacheFile()));
return $datas; return $datas;
} }
public function saveData($datas){ public function saveData($datas){
$this->isPrepareCache();
$writeStream = file_put_contents($this->getCacheFile(), serialize($datas)); $writeStream = file_put_contents($this->getCacheFile(), serialize($datas));
if(!$writeStream) { if(!$writeStream) {
@ -25,8 +22,6 @@ class FileCache implements CacheInterface {
} }
public function getTime(){ public function getTime(){
$this->isPrepareCache();
$cacheFile = $this->getCacheFile(); $cacheFile = $this->getCacheFile();
if(file_exists($cacheFile)){ if(file_exists($cacheFile)){
return filemtime($cacheFile); return filemtime($cacheFile);
@ -65,19 +60,6 @@ class FileCache implements CacheInterface {
return $this; return $this;
} }
/**
* Cache is prepared ?
* Note : Cache name is based on request information, then cache must be prepare before use
* @return \Exception|true
*/
protected function isPrepareCache(){
if(is_null($this->param)){
throw new \Exception('Please feed "setParameters" method before try to load');
}
return true;
}
/** /**
* Return cache path (and create if not exist) * Return cache path (and create if not exist)
* @return string Cache path * @return string Cache path
@ -106,7 +88,10 @@ class FileCache implements CacheInterface {
* return string * return string
*/ */
protected function getCacheName(){ protected function getCacheName(){
$this->isPrepareCache(); if(is_null($this->param)){
throw new \Exception('Call "setParameters" first!');
}
return hash('sha1', http_build_query($this->param)) . '.cache'; return hash('sha1', http_build_query($this->param)) . '.cache';
} }
} }