diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FrameworkBundle] fixed name collision

Browse Source
This commit is contained in:
Fabien Potencier 2012-04-13 09:04:04 +02:00
parent d87a197d80
commit 114bc14c21
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
View File

@ -39,7 +39,7 @@ abstract class HttpCache extends BaseHttpCache
$this->kernel = $kernel; $this->kernel = $kernel;
$this->cacheDir = $cacheDir; $this->cacheDir = $cacheDir;
parent::__construct($kernel, $this->getStore(), $this->getEsi(), array_merge(array('debug' => $kernel->isDebug()), $this->getOptions())); parent::__construct($kernel, $this->createStore(), $this->createEsi(), array_merge(array('debug' => $kernel->isDebug()), $this->getOptions()));
} }
/** /**
@ -70,12 +70,12 @@ abstract class HttpCache extends BaseHttpCache
return array(); return array();
} }
protected function getEsi() protected function createEsi()
{ {
return new Esi(); return new Esi();
} }
protected function getStore() protected function createStore()
{ {
return new Store($this->cacheDir ?: $this->kernel->getCacheDir().'/http_cache'); return new Store($this->cacheDir ?: $this->kernel->getCacheDir().'/http_cache');
} }