--

lyrixx · nicolas-grekas · commit f1941605b3d1 · 2019-05-09T19:11:56.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -227,8 +227,6 @@ protected function getContainerBuilder()
             $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()));
         }
 
         return $this->containerBuilder = $container;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -324,8 +324,8 @@ private function getContainerEnvVars(ContainerBuilder $container): array
     {
         $file = file_get_contents($container->getParameter('debug.container.dump'));
 
-        preg_match_all('{%env\((.*)\)%}', $file, $envVars);
-        $envVars = array_unique($envVars[1]);
+        preg_match_all('{([%"])env\(((?:\w++:)*+\w++)\)\1}', $file, $envVars);
+        $envVars = array_unique($envVars[2]);
 
         $getEnvReflection = new \ReflectionMethod($container, 'getEnv');
         $getEnvReflection->setAccessible(true);
@@ -337,7 +337,7 @@ private function getContainerEnvVars(ContainerBuilder $container): array
                 $processor = substr($env, 0, $i);
             }
             $defaultValue = ($hasDefault = $container->hasParameter("env($name)")) ? $container->getParameter("env($name)") : null;
-            if (false === ($runtimeValue = $_ENV[$name] ?? $_SERVER[$name] ?? getenv($name))) {
+            if (false === $runtimeValue = $_ENV[$name] ?? $_SERVER[$name] ?? getenv($name)) {
                 $runtimeValue = null;
             }
             $processedValue = ($hasRuntime = null !== $runtimeValue) || $hasDefault ? $getEnvReflection->invoke($container, $env) : null;
@@ -351,6 +351,7 @@ private function getContainerEnvVars(ContainerBuilder $container): array
                 'processed_value' => $processedValue,
             ];
         }
+
         ksort($envs);
 
         return array_values($envs);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -411,7 +411,7 @@ protected function describeContainerEnvVars(array $envs, array $options = [])
                     $matches = true;
                     $options['output']->section('%env('.$env['processor'].':'.$env['name'].')%');
                     $options['output']->table([], [
-                        ['<info>Default value</>', $env['default_available'] ? $dump($env['default_value']) : 'n/a'],
+                        ['<info>Default value</>', $env['default_available'] ? $dump($env['processed_value']) : 'n/a'],
                         ['<info>Real value</>', $env['runtime_available'] ? $dump($env['runtime_value']) : 'n/a'],
                         ['<info>Processed value</>', $env['default_available'] || $env['runtime_available'] ? $dump($env['processed_value']) : 'n/a'],
                     ]);
@@ -442,7 +442,7 @@ protected function describeContainerEnvVars(array $envs, array $options = [])
 
             $rows[$env['name']] = [
                 $env['name'],
-                $env['default_available'] ? $dump($env['default_value']) : 'n/a',
+                $env['default_available'] ? $dump($env['processed_value']) : 'n/a',
                 $env['runtime_available'] ? $dump($env['runtime_value']) : 'n/a',
             ];
             if (!$env['default_available'] && !$env['runtime_available']) {

Original file line number	Diff line number	Diff line change
`@@ -227,8 +227,6 @@ protected function getContainerBuilder()`
`227`	`227`	`$container->compile();`
`228`	`228`	`} else {`
`229`	`229`	`(new XmlFileLoader($container = new ContainerBuilder(), new FileLocator()))->load($kernel->getContainer()->getParameter('debug.container.dump'));`
`230`		`- $container->setParameter('container.build_hash', $hash = ContainerBuilder::hash(__METHOD__));`
`231`		`- $container->setParameter('container.build_id', hash('crc32', $hash.time()));`
`232`	`230`	`}`
`233`	`231`
`234`	`232`	`return $this->containerBuilder = $container;`
Original file line number	Diff line number	Diff line change
`@@ -324,8 +324,8 @@ private function getContainerEnvVars(ContainerBuilder $container): array`
`324`	`324`	`{`
`325`	`325`	`$file = file_get_contents($container->getParameter('debug.container.dump'));`
`326`	`326`
`327`		`- preg_match_all('{%env\((.*)\)%}', $file, $envVars);`
`328`		`- $envVars = array_unique($envVars[1]);`
	`327`	`+ preg_match_all('{([%"])env\(((?:\w++:)*+\w++)\)\1}', $file, $envVars);`
	`328`	`+ $envVars = array_unique($envVars[2]);`
`329`	`329`
`330`	`330`	`$getEnvReflection = new \ReflectionMethod($container, 'getEnv');`
`331`	`331`	`$getEnvReflection->setAccessible(true);`
`@@ -337,7 +337,7 @@ private function getContainerEnvVars(ContainerBuilder $container): array`
`337`	`337`	`$processor = substr($env, 0, $i);`
`338`	`338`	`}`
`339`	`339`	`$defaultValue = ($hasDefault = $container->hasParameter("env($name)")) ? $container->getParameter("env($name)") : null;`
`340`		`- if (false === ($runtimeValue = $_ENV[$name] ?? $_SERVER[$name] ?? getenv($name))) {`
	`340`	`+ if (false === $runtimeValue = $_ENV[$name] ?? $_SERVER[$name] ?? getenv($name)) {`
`341`	`341`	`$runtimeValue = null;`
`342`	`342`	`}`
`343`	`343`	`$processedValue = ($hasRuntime = null !== $runtimeValue) \|\| $hasDefault ? $getEnvReflection->invoke($container, $env) : null;`
`@@ -351,6 +351,7 @@ private function getContainerEnvVars(ContainerBuilder $container): array`
`351`	`351`	`'processed_value' => $processedValue,`
`352`	`352`	`];`
`353`	`353`	`}`
	`354`	`+`
`354`	`355`	`ksort($envs);`
`355`	`356`
`356`	`357`	`return array_values($envs);`