[HttpKernel] Fix mem usage when stripping the prod container

nicolas-grekas · nicolas-grekas · commit 5f1ce343b6b3 · 2016-03-08T15:35:06.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -53,6 +53,7 @@ class PhpDumper extends Dumper
     private $reservedVariables = array('instance', 'class');
     private $targetDirRegex;
     private $targetDirMaxMatches;
+    private $docStar;
 
     /**
      * @var \Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface
@@ -97,7 +98,9 @@ public function dump(array $options = array())
         $options = array_merge(array(
             'class' => 'ProjectServiceContainer',
             'base_class' => 'Container',
+            'debug' => true,
         ), $options);
+        $this->docStar = $options['debug'] ? '*' : '';
 
         if (!empty($options['file']) && is_dir($dir = dirname($options['file']))) {
             // Build a regexp where the first root dirs are mandatory,
@@ -223,6 +226,9 @@ private function addProxyClasses()
         foreach ($definitions as $definition) {
             $code .= "\n".$this->getProxyDumper()->getProxyCode($definition);
         }
+        if ('' === $this->docStar) {
+            $code = str_replace('/**', '/*', $code);
+        }
 
         return $code;
     }
@@ -589,7 +595,7 @@ private function addService($id, $definition)
         $visibility = $isProxyCandidate ? 'public' : 'protected';
         $code = <<<EOF
 
-    /**
+    /*{$this->docStar}
      * Gets the '$id' service.$doc
      *$lazyInitializationDoc
      * $return
@@ -699,7 +705,7 @@ private function addServiceSynchronizer($id, Definition $definition)
 
         return <<<EOF
 
-    /**
+    /*{$this->docStar}
      * Updates the '$id' service.
      */
     protected function synchronize{$this->camelize($id)}Service()
@@ -760,7 +766,7 @@ private function startClass($class, $baseClass)
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 $bagClass
 
-/**
+/*{$this->docStar}
  * $class.
  *
  * This class has been auto-generated
@@ -786,7 +792,7 @@ private function addConstructor()
 
         $code = <<<EOF
 
-    /**
+    /*{$this->docStar}
      * Constructor.
      */
     public function __construct()
@@ -823,7 +829,7 @@ private function addFrozenConstructor()
 
         $code = <<<EOF
 
-    /**
+    /*{$this->docStar}
      * Constructor.
      */
     public function __construct()
@@ -970,11 +976,14 @@ public function getParameterBag()
         return $this->parameterBag;
     }
 EOF;
+            if ('' === $this->docStar) {
+                $code = str_replace('/**', '/*', $code);
+            }
         }
 
         $code .= <<<EOF
 
-    /**
+    /*{$this->docStar}
      * Gets the default parameters.
      *
      * @return array An array of the default parameters
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -650,10 +650,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
             $dumper->setProxyDumper(new ProxyDumper(md5((string) $cache)));
         }
 
-        $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => (string) $cache));
-        if (!$this->debug) {
-            $content = static::stripComments($content);
-        }
+        $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => (string) $cache, 'debug' => $this->debug));
 
         $cache->write($content, $container->getResources());
     }

Original file line number	Diff line number	Diff line change
`@@ -650,10 +650,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container`
`650`	`650`	`$dumper->setProxyDumper(new ProxyDumper(md5((string) $cache)));`
`651`	`651`	`}`
`652`	`652`
`653`		`- $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => (string) $cache));`
`654`		`- if (!$this->debug) {`
`655`		`- $content = static::stripComments($content);`
`656`		`- }`
	`653`	`+ $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => (string) $cache, 'debug' => $this->debug));`
`657`	`654`
`658`	`655`	`$cache->write($content, $container->getResources());`
`659`	`656`	`}`