[FrameworkBundle] made the Esi and Store instances configurable in Ht…

…tpCache base class

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');
+    }
 }