Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit ad93a6764e24 · 2016-03-10T11:53:53.000+01:00
* 2.7:
  [Finder] Partially revert #17134 to fix a regression
  [HttpKernel] Fix mem usage when stripping the prod container
  exception when registering bags for started sessions

Conflicts:
	src/Symfony/Component/Validator/composer.json
diff --git a/Kernel.php b/Kernel.php
@@ -663,10 +663,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
             $dumper->setProxyDumper(new ProxyDumper(md5($cache->getPath())));
         }
 
-        $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => $cache->getPath()));
-        if (!$this->debug) {
-            $content = static::stripComments($content);
-        }
+        $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => $cache->getPath(), 'debug' => $this->debug));
 
         $cache->write($content, $container->getResources());
     }

Original file line number	Diff line number	Diff line change
`@@ -663,10 +663,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container`
`663`	`663`	`$dumper->setProxyDumper(new ProxyDumper(md5($cache->getPath())));`
`664`	`664`	`}`
`665`	`665`
`666`		`- $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => $cache->getPath()));`
`667`		`- if (!$this->debug) {`
`668`		`- $content = static::stripComments($content);`
`669`		`- }`
	`666`	`+ $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => $cache->getPath(), 'debug' => $this->debug));`
`670`	`667`
`671`	`668`	`$cache->write($content, $container->getResources());`
`672`	`669`	`}`