symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
+2-5Lines changed: 2 additions & 5 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
+2-5Lines changed: 2 additions & 5 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+14-3Lines changed: 14 additions & 3 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+14-3Lines changed: 14 additions & 3 deletions
@@ -224,15 +224,12 @@ protected function getContainerBuilder()
         if (!$kernel->isDebug() || !(new ConfigCache($kernel->getContainer()->getParameter('debug.container.dump'), true))->isFresh()) {
             $buildContainer = \Closure::bind(function () { return $this->buildContainer(); }, $kernel, \get_class($kernel));
             $container = $buildContainer();
+            $container->getCompilerPassConfig()->setRemovingPasses([]);
+            $container->compile();
         } else {
             (new XmlFileLoader($container = new ContainerBuilder(), new FileLocator()))->load($kernel->getContainer()->getParameter('debug.container.dump'));
-            $container->setParameter('container.build_hash', $hash = ContainerBuilder::hash(__METHOD__));
-            $container->setParameter('container.build_id', hash('crc32', $hash.time()));
         }
 
-        $container->getCompilerPassConfig()->setRemovingPasses([]);
-        $container->compile();
-
         return $this->containerBuilder = $container;
     }
 
 
@@ -322,16 +322,27 @@ public static function getClassDescription(string $class, string &$resolvedClass
 
     private function getContainerEnvVars(ContainerBuilder $container): array
     {
+        $bag = $container->getParameterBag();
+        $getDefaultParamter = function($name) {
+            return parent::get($name);
+        };
+        $getDefaultParamter = $getDefaultParamter->bindTo($bag, get_class($bag));
+
+        $file = file_get_contents($container->getParameter('debug.container.dump'));
+
+        preg_match_all('{%env\((.*)\)%}', $file, $envVars);
+        $envVars = array_unique($envVars[1]);
+
         $getEnvReflection = new \ReflectionMethod($container, 'getEnv');
         $getEnvReflection->setAccessible(true);
-        $envs = [];
-        foreach (array_keys($container->getEnvCounters()) as $env) {
+
+        foreach ($envVars as $env) {
             $processor = 'string';
             if (false !== $i = strrpos($name = $env, ':')) {
                 $name = substr($env, $i + 1);
                 $processor = substr($env, 0, $i);
             }
-            $defaultValue = ($hasDefault = $container->hasParameter("env($name)")) ? $container->getParameter("env($name)") : null;
+            $defaultValue = ($hasDefault = $container->hasParameter("env($name)")) ? $getDefaultParamter("env($name)") : null;
             if (false === ($runtimeValue = $_ENV[$name] ?? $_SERVER[$name] ?? getenv($name))) {
                 $runtimeValue = null;
             }