Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 8d2d50d2a4bb · 2016-03-10T11:49:29.000+01:00
* 2.3:
  [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/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/HttpKernel/Kernel.php
diff --git a/Kernel.php b/Kernel.php
@@ -662,10 +662,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
`@@ -662,10 +662,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container`
`662`	`662`	`$dumper->setProxyDumper(new ProxyDumper(md5($cache->getPath())));`
`663`	`663`	`}`
`664`	`664`
`665`		`- $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => $cache->getPath()));`
`666`		`- if (!$this->debug) {`
`667`		`- $content = static::stripComments($content);`
`668`		`- }`
	`665`	`+ $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => $cache->getPath(), 'debug' => $this->debug));`
`669`	`666`
`670`	`667`	`$cache->write($content, $container->getResources());`
`671`	`668`	`}`