[FrameworkBundle] made the Esi and Store instances configurable in HttpCache base class

fabpot · fabpot · commit 70df8d38923e · 2012-04-13T07:23:33.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
@@ -25,6 +25,9 @@
  */
 abstract class HttpCache extends BaseHttpCache
 {
+    protected $cacheDir;
+    protected $kernel;
+
     /**
      * Constructor.
      *
@@ -33,10 +36,10 @@ abstract class HttpCache extends BaseHttpCache
      */
     public function __construct(HttpKernelInterface $kernel, $cacheDir = null)
     {
-        $store = new Store($cacheDir ?: $kernel->getCacheDir().'/http_cache');
-        $esi = new Esi();
+        $this->kernel = $kernel;
+        $this->cacheDir = $cacheDir;
 
-        parent::__construct($kernel, $store, $esi, array_merge(array('debug' => $kernel->isDebug()), $this->getOptions()));
+        parent::__construct($kernel, $this->getStore(), $this->getEsi(), array_merge(array('debug' => $kernel->isDebug()), $this->getOptions()));
     }
 
     /**
@@ -66,4 +69,14 @@ protected function getOptions()
     {
         return array();
     }
+
+    protected function getEsi()
+    {
+        return new Esi();
+    }
+
+    protected function getStore()
+    {
+        return new Store($this->cacheDir ?: $this->kernel->getCacheDir().'/http_cache');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,9 @@`
`25`	`25`	`*/`
`26`	`26`	`abstract class HttpCache extends BaseHttpCache`
`27`	`27`	`{`
	`28`	`+ protected $cacheDir;`
	`29`	`+ protected $kernel;`
	`30`	`+`
`28`	`31`	`/**`
`29`	`32`	`* Constructor.`
`30`	`33`	`*`
`@@ -33,10 +36,10 @@ abstract class HttpCache extends BaseHttpCache`
`33`	`36`	`*/`
`34`	`37`	`public function __construct(HttpKernelInterface $kernel, $cacheDir = null)`
`35`	`38`	`{`
`36`		`- $store = new Store($cacheDir ?: $kernel->getCacheDir().'/http_cache');`
`37`		`- $esi = new Esi();`
	`39`	`+ $this->kernel = $kernel;`
	`40`	`+ $this->cacheDir = $cacheDir;`
`38`	`41`
`39`		`- parent::__construct($kernel, $store, $esi, array_merge(array('debug' => $kernel->isDebug()), $this->getOptions()));`
	`42`	`+ parent::__construct($kernel, $this->getStore(), $this->getEsi(), array_merge(array('debug' => $kernel->isDebug()), $this->getOptions()));`
`40`	`43`	`}`
`41`	`44`
`42`	`45`	`/**`
`@@ -66,4 +69,14 @@ protected function getOptions()`
`66`	`69`	`{`
`67`	`70`	`return array();`
`68`	`71`	`}`
	`72`	`+`
	`73`	`+ protected function getEsi()`
	`74`	`+ {`
	`75`	`+ return new Esi();`
	`76`	`+ }`
	`77`	`+`
	`78`	`+ protected function getStore()`
	`79`	`+ {`
	`80`	`+ return new Store($this->cacheDir ?: $this->kernel->getCacheDir().'/http_cache');`
	`81`	`+ }`
`69`	`82`	`}`