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

Merge branch '3.3' into 3.4

Browse Source 
* 3.3:
  remove useless comment
  fix merge
This commit is contained in:
Nicolas Grekas 2017-07-18 13:59:19 +02:00
commit a1846f0637
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@ abstract class HttpCache extends BaseHttpCache
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);
}

4
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View File

@ -1618,10 +1618,6 @@ EOF;
} elseif (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
$code = sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
} else {
if ($this->container->hasAlias($id)) {
$id = (string) $this->container->getAlias($id);
}
$code = sprintf('$this->get(\'%s\')', $id);
}