[DependencyInjection] Optimize exporting variables

Sander van der Vlugt · nicolas-grekas · commit 768de2f7d902 · 2018-10-23T09:21:50.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -80,6 +80,7 @@ class PhpDumper extends Dumper
     private $addGetService = false;
     private $locatedIds = array();
     private $serviceLocatorTag;
+    private $exportedVariables = array();
 
     /**
      * @var ProxyDumper
@@ -125,6 +126,7 @@ public function dump(array $options = array())
         $this->locatedIds = array();
         $this->targetDirRegex = null;
         $this->inlinedRequires = array();
+        $this->exportedVariables = array();
         $options = array_merge(array(
             'class' => 'ProjectServiceContainer',
             'base_class' => 'Container',
@@ -304,6 +306,7 @@ public function dump(array $options = array())
         $this->inlinedRequires = array();
         $this->circularReferences = array();
         $this->locatedIds = array();
+        $this->exportedVariables = array();
 
         $unusedEnvs = array();
         foreach ($this->container->getEnvCounters() as $env => $use) {
@@ -1768,6 +1771,10 @@ private function export($value)
 
     private function doExport($value, $resolveEnv = false)
     {
+        $shouldCacheValue = $resolveEnv && \is_string($value);
+        if ($shouldCacheValue && isset($this->exportedVariables[$value])) {
+            return $this->exportedVariables[$value];
+        }
         if (\is_string($value) && false !== strpos($value, "\n")) {
             $cleanParts = explode("\n", $value);
             $cleanParts = array_map(function ($part) { return var_export($part, true); }, $cleanParts);
@@ -1789,6 +1796,10 @@ private function doExport($value, $resolveEnv = false)
             }
         }
 
+        if ($shouldCacheValue) {
+            $this->exportedVariables[$value] = $export;
+        }
+
         return $export;
     }
 }
