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

Merge remote branch 'mbontemps/httpCache-fix'

Browse Source 
* mbontemps/httpCache-fix:
  Add a public getter for the Esi instance
  Fix kernel access in HttpCache due to kernel attribute privatization
This commit is contained in:
Fabien Potencier 2011-03-28 19:50:12 +02:00
commit 3d44c44f9a
2 changed files with 24 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

@ -49,9 +49,9 @@ abstract class HttpCache extends BaseHttpCache
*/
protected function forward(Request $request, $raw = false, Response $entry = null)
{
$this->kernel->boot();
$this->kernel->getContainer()->set('cache', $this);
$this->kernel->getContainer()->set('esi', $this->esi);
$this->getKernel()->boot();
$this->getKernel()->getContainer()->set('cache', $this);
$this->getKernel()->getContainer()->set('esi', $this->getEsi());
return parent::forward($request, $raw, $entry);
}

21
src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
View File

@ -128,6 +128,27 @@ class HttpCache implements HttpKernelInterface
return $this->request;
}
/**
* Gets the Kernel instance
*
* @return Symfony\Component\HttpKernel\HttpKernelInterface An HttpKernelInterface instance
*/
public function getKernel()
{
return $this->kernel;
}
/**
* Gets the Esi instance
*
* @return Symfony\Component\HttpKernel\HttpCache\Esi An Esi instance
*/
public function getEsi()
{
return $this->esi;
}
/**
* {@inheritdoc}
*/