Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit a48d5bd5c545 · 2017-07-18T13:59:19.000+02:00
* 3.3:
  remove useless comment
  fix merge
diff --git a/HttpCache/HttpCache.php b/HttpCache/HttpCache.php
@@ -54,7 +54,7 @@ public function __construct(HttpKernelInterface $kernel, $cacheDir = null)
     protected function forward(Request $request, $raw = false, Response $entry = null)
     {
         $this->getKernel()->boot();
-        $this->getKernel()->getContainer()->set('cache', $this); // to be removed in 4.0?
+        $this->getKernel()->getContainer()->set('cache', $this);
 
         return parent::forward($request, $raw, $entry);
     }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function __construct(HttpKernelInterface $kernel, $cacheDir = null)`
`54`	`54`	`protected function forward(Request $request, $raw = false, Response $entry = null)`
`55`	`55`	`{`
`56`	`56`	`$this->getKernel()->boot();`
`57`		`- $this->getKernel()->getContainer()->set('cache', $this); // to be removed in 4.0?`
	`57`	`+ $this->getKernel()->getContainer()->set('cache', $this);`
`58`	`58`
`59`	`59`	`return parent::forward($request, $raw, $entry);`
`60`	`60`	`}`