Merge branch '4.0'

nicolas-grekas · nicolas-grekas · commit a0dc65f295ed · 2018-01-04T17:09:16.000+01:00
* 4.0:
  [DI] fix param name cast
  Remove randomness from dumped containers
  fixed messages to be explicit about the package needed to be installed
  [FrameworkBundle] Fix recommended composer command (add vendor)
  [WebProfilerBundle] set the var in the right scope
  [TwigBundle] fix lowest dep
  [HttpKernel] Disable CSP header on exception pages
  Use the default host even if context is empty and fallback to relative URL if empty host
  Proposing Flex-specific error messages in the controller shortcuts
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -1190,6 +1190,8 @@ private function doResolveServices($value, array &$inlineServices = array())
             $value = $this->doGet((string) $value, $value->getInvalidBehavior(), $inlineServices);
         } elseif ($value instanceof Definition) {
             $value = $this->createService($value, $inlineServices);
+        } elseif ($value instanceof Parameter) {
+            $value = $this->getParameter((string) $value);
         } elseif ($value instanceof Expression) {
             $value = $this->getExpressionLanguage()->evaluate($value, array('container' => $this));
         }
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -218,6 +218,8 @@ public function dump(array $options = array())
             array_pop($code);
             $code["Container{$hash}/{$options['class']}.php"] = substr_replace($files[$options['class'].'.php'], "<?php\n\nnamespace Container{$hash};\n", 0, 6);
             $namespaceLine = $this->namespace ? "\nnamespace {$this->namespace};\n" : '';
+            $time = time();
+            $id = hash('crc32', $hash.$time);
 
             $code[$options['class'].'.php'] = <<<EOF
 <?php
@@ -236,7 +238,11 @@ public function dump(array $options = array())
     \\class_alias(\\Container{$hash}\\{$options['class']}::class, {$options['class']}::class, false);
 }
 
-return new \\Container{$hash}\\{$options['class']}();
+return new \\Container{$hash}\\{$options['class']}(array(
+    'container.build_hash' => '$hash',
+    'container.build_id' => '$id',
+    'container.build_time' => $time,
+));
 
 EOF;
         } else {
@@ -543,15 +549,15 @@ private function isTrivialInstance(Definition $definition): bool
         }
 
         foreach ($definition->getArguments() as $arg) {
-            if (!$arg) {
+            if (!$arg || $arg instanceof Parameter) {
                 continue;
             }
             if (is_array($arg) && 3 >= count($arg)) {
                 foreach ($arg as $k => $v) {
                     if ($this->dumpValue($k) !== $this->dumpValue($k, false)) {
                         return false;
                     }
-                    if (!$v) {
+                    if (!$v || $v instanceof Parameter) {
                         continue;
                     }
                     if ($v instanceof Reference && $this->container->has($id = (string) $v) && $this->container->findDefinition($id)->isSynthetic()) {
@@ -837,10 +843,10 @@ private function addNewInstance(Definition $definition, $return, $instantiation,
                 }
 
                 if (0 === strpos($class, 'new ')) {
-                    return $return.sprintf("(%s)->%s(%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '');
+                    return $return.sprintf("(%s)->%s(%s);\n", $class, $callable[1], $arguments ? implode(', ', $arguments) : '');
                 }
 
-                return $return.sprintf("[%s, '%s'](%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '');
+                return $return.sprintf("[%s, '%s'](%s);\n", $class, $callable[1], $arguments ? implode(', ', $arguments) : '');
             }
 
             return $return.sprintf("%s(%s);\n", $this->dumpLiteralClass($this->dumpValue($callable)), $arguments ? implode(', ', $arguments) : '');
@@ -898,6 +904,11 @@ public function __construct()
 
 EOF;
         }
+        if ($this->asFiles) {
+            $code = str_replace('$parameters', "\$buildParameters;\n    private \$parameters", $code);
+            $code = str_replace('__construct()', '__construct(array $buildParameters = array())', $code);
+            $code .= "        \$this->buildParameters = \$buildParameters;\n";
+        }
 
         if ($this->container->getParameterBag()->all()) {
             $code .= "        \$this->parameters = \$this->getDefaultParameters();\n\n";
@@ -1126,6 +1137,9 @@ private function addDefaultParametersMethod(): string
     public function getParameter($name)
     {
         $name = (string) $name;
+        if (isset($this->buildParameters[$name])) {
+            return $this->buildParameters[$name];
+        }
 
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
             throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
@@ -1140,6 +1154,9 @@ public function getParameter($name)
     public function hasParameter($name)
     {
         $name = (string) $name;
+        if (isset($this->buildParameters[$name])) {
+            return true;
+        }
 
         return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
     }
@@ -1156,13 +1173,19 @@ public function getParameterBag()
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
             }
+            foreach ($this->buildParameters as $name => $value) {
+                $parameters[$name] = $value;
+            }
             $this->parameterBag = new FrozenParameterBag($parameters);
         }
 
         return $this->parameterBag;
     }
 
 EOF;
+            if (!$this->asFiles) {
+                $code = preg_replace('/^.*buildParameters.*\n.*\n.*\n/m', '', $code);
+            }
 
         if ($dynamicPhp) {
             $loadedDynamicParameters = $this->exportParameters(array_combine(array_keys($dynamicPhp), array_fill(0, count($dynamicPhp), false)), '', 8);
@@ -1483,16 +1506,21 @@ private function dumpValue($value, bool $interpolate = true): string
                         throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s)', $factory[1] ?: 'n/a'));
                     }
 
+                    $class = $this->dumpValue($factory[0]);
                     if (is_string($factory[0])) {
-                        return sprintf('%s::%s(%s)', $this->dumpLiteralClass($this->dumpValue($factory[0])), $factory[1], implode(', ', $arguments));
+                        return sprintf('%s::%s(%s)', $this->dumpLiteralClass($class), $factory[1], implode(', ', $arguments));
                     }
 
                     if ($factory[0] instanceof Definition) {
-                        return sprintf("[%s, '%s'](%s)", $this->dumpValue($factory[0]), $factory[1], implode(', ', $arguments));
+                        if (0 === strpos($class, 'new ')) {
+                            return sprintf('(%s)->%s(%s)', $class, $factory[1], implode(', ', $arguments));
+                        }
+
+                        return sprintf("[%s, '%s'](%s)", $class, $factory[1], implode(', ', $arguments));
                     }
 
                     if ($factory[0] instanceof Reference) {
-                        return sprintf('%s->%s(%s)', $this->dumpValue($factory[0]), $factory[1], implode(', ', $arguments));
+                        return sprintf('%s->%s(%s)', $class, $factory[1], implode(', ', $arguments));
                     }
                 }
 
diff --git a/Tests/Fixtures/php/services9_as_files.txt b/Tests/Fixtures/php/services9_as_files.txt
@@ -307,6 +307,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
  */
 class ProjectServiceContainer extends Container
 {
+    private $buildParameters;
     private $parameters;
     private $targetDirs = array();
 
@@ -315,12 +316,13 @@ class ProjectServiceContainer extends Container
      */
     protected $privates = array();
 
-    public function __construct()
+    public function __construct(array $buildParameters = array())
     {
         $dir = $this->targetDirs[0] = \dirname(__DIR__);
         for ($i = 1; $i <= 5; ++$i) {
             $this->targetDirs[$i] = $dir = \dirname($dir);
         }
+        $this->buildParameters = $buildParameters;
         $this->parameters = $this->getDefaultParameters();
 
         $this->services = $this->privates = array();
@@ -415,6 +417,9 @@ class ProjectServiceContainer extends Container
     public function getParameter($name)
     {
         $name = (string) $name;
+        if (isset($this->buildParameters[$name])) {
+            return $this->buildParameters[$name];
+        }
 
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
             throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
@@ -429,6 +434,9 @@ class ProjectServiceContainer extends Container
     public function hasParameter($name)
     {
         $name = (string) $name;
+        if (isset($this->buildParameters[$name])) {
+            return true;
+        }
 
         return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
     }
@@ -445,6 +453,9 @@ class ProjectServiceContainer extends Container
             foreach ($this->loadedDynamicParameters as $name => $loaded) {
                 $parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
             }
+            foreach ($this->buildParameters as $name => $value) {
+                $parameters[$name] = $value;
+            }
             $this->parameterBag = new FrozenParameterBag($parameters);
         }
 
@@ -499,6 +510,10 @@ if (!\class_exists(ProjectServiceContainer::class, false)) {
     \class_alias(\Container%s\ProjectServiceContainer::class, ProjectServiceContainer::class, false);
 }
 
-return new \Container%s\ProjectServiceContainer();
+return new \Container%s\ProjectServiceContainer(array(
+    'container.build_hash' => '%s',
+    'container.build_id' => '%s',
+    'container.build_time' => %d,
+));
 
 )
diff --git a/Tests/Fixtures/php/services_subscriber.php b/Tests/Fixtures/php/services_subscriber.php
@@ -79,14 +79,14 @@ protected function getTestServiceSubscriberService()
      */
     protected function getFooServiceService()
     {
-        return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber([new \Symfony\Component\DependencyInjection\ServiceLocator(array('Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => function (): ?\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition {
+        return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber((new \Symfony\Component\DependencyInjection\ServiceLocator(array('Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => function (): ?\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition {
             return ($this->privates['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] ?? $this->privates['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition());
         }, 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => function (): \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber {
             return ($this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] ?? $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber());
         }, 'bar' => function (): \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition {
             return ($this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] ?? $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber());
         }, 'baz' => function (): ?\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition {
             return ($this->privates['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] ?? $this->privates['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition());
-        })), 'withContext']('foo_service', $this));
+        })))->withContext('foo_service', $this));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1190,6 +1190,8 @@ private function doResolveServices($value, array &$inlineServices = array())`
`1190`	`1190`	`$value = $this->doGet((string) $value, $value->getInvalidBehavior(), $inlineServices);`
`1191`	`1191`	`} elseif ($value instanceof Definition) {`
`1192`	`1192`	`$value = $this->createService($value, $inlineServices);`
	`1193`	`+ } elseif ($value instanceof Parameter) {`
	`1194`	`+ $value = $this->getParameter((string) $value);`
`1193`	`1195`	`} elseif ($value instanceof Expression) {`
`1194`	`1196`	`$value = $this->getExpressionLanguage()->evaluate($value, array('container' => $this));`
`1195`	`1197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,8 @@ public function dump(array $options = array())`
`218`	`218`	`array_pop($code);`
`219`	`219`	`$code["Container{$hash}/{$options['class']}.php"] = substr_replace($files[$options['class'].'.php'], "<?php\n\nnamespace Container{$hash};\n", 0, 6);`
`220`	`220`	`$namespaceLine = $this->namespace ? "\nnamespace {$this->namespace};\n" : '';`
	`221`	`+ $time = time();`
	`222`	`+ $id = hash('crc32', $hash.$time);`
`221`	`223`
`222`	`224`	`$code[$options['class'].'.php'] = <<<EOF`
`223`	`225`	`<?php`
`@@ -236,7 +238,11 @@ public function dump(array $options = array())`
`236`	`238`	`\\class_alias(\\Container{$hash}\\{$options['class']}::class, {$options['class']}::class, false);`
`237`	`239`	`}`
`238`	`240`
`239`		`-return new \\Container{$hash}\\{$options['class']}();`
	`241`	`+return new \\Container{$hash}\\{$options['class']}(array(`
	`242`	`+ 'container.build_hash' => '$hash',`
	`243`	`+ 'container.build_id' => '$id',`
	`244`	`+ 'container.build_time' => $time,`
	`245`	`+));`
`240`	`246`
`241`	`247`	`EOF;`
`242`	`248`	`} else {`
`@@ -543,15 +549,15 @@ private function isTrivialInstance(Definition $definition): bool`
`543`	`549`	`}`
`544`	`550`
`545`	`551`	`foreach ($definition->getArguments() as $arg) {`
`546`		`- if (!$arg) {`
	`552`	`+ if (!$arg \|\| $arg instanceof Parameter) {`
`547`	`553`	`continue;`
`548`	`554`	`}`
`549`	`555`	`if (is_array($arg) && 3 >= count($arg)) {`
`550`	`556`	`foreach ($arg as $k => $v) {`
`551`	`557`	`if ($this->dumpValue($k) !== $this->dumpValue($k, false)) {`
`552`	`558`	`return false;`
`553`	`559`	`}`
`554`		`- if (!$v) {`
	`560`	`+ if (!$v \|\| $v instanceof Parameter) {`
`555`	`561`	`continue;`
`556`	`562`	`}`
`557`	`563`	`if ($v instanceof Reference && $this->container->has($id = (string) $v) && $this->container->findDefinition($id)->isSynthetic()) {`
`@@ -837,10 +843,10 @@ private function addNewInstance(Definition $definition, $return, $instantiation,`
`837`	`843`	`}`
`838`	`844`
`839`	`845`	`if (0 === strpos($class, 'new ')) {`
`840`		`- return $return.sprintf("(%s)->%s(%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '');`
	`846`	`+ return $return.sprintf("(%s)->%s(%s);\n", $class, $callable[1], $arguments ? implode(', ', $arguments) : '');`
`841`	`847`	`}`
`842`	`848`
`843`		`- return $return.sprintf("[%s, '%s'](%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '');`
	`849`	`+ return $return.sprintf("[%s, '%s'](%s);\n", $class, $callable[1], $arguments ? implode(', ', $arguments) : '');`
`844`	`850`	`}`
`845`	`851`
`846`	`852`	`return $return.sprintf("%s(%s);\n", $this->dumpLiteralClass($this->dumpValue($callable)), $arguments ? implode(', ', $arguments) : '');`
`@@ -898,6 +904,11 @@ public function __construct()`
`898`	`904`
`899`	`905`	`EOF;`
`900`	`906`	`}`
	`907`	`+ if ($this->asFiles) {`
	`908`	`+ $code = str_replace('$parameters', "\$buildParameters;\n private \$parameters", $code);`
	`909`	`+ $code = str_replace('__construct()', '__construct(array $buildParameters = array())', $code);`
	`910`	`+ $code .= " \$this->buildParameters = \$buildParameters;\n";`
	`911`	`+ }`
`901`	`912`
`902`	`913`	`if ($this->container->getParameterBag()->all()) {`
`903`	`914`	`$code .= " \$this->parameters = \$this->getDefaultParameters();\n\n";`
`@@ -1126,6 +1137,9 @@ private function addDefaultParametersMethod(): string`
`1126`	`1137`	`public function getParameter($name)`
`1127`	`1138`	`{`
`1128`	`1139`	`$name = (string) $name;`
	`1140`	`+ if (isset($this->buildParameters[$name])) {`
	`1141`	`+ return $this->buildParameters[$name];`
	`1142`	`+ }`
`1129`	`1143`
`1130`	`1144`	`if (!(isset($this->parameters[$name]) \|\| isset($this->loadedDynamicParameters[$name]) \|\| array_key_exists($name, $this->parameters))) {`
`1131`	`1145`	`throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));`
`@@ -1140,6 +1154,9 @@ public function getParameter($name)`
`1140`	`1154`	`public function hasParameter($name)`
`1141`	`1155`	`{`
`1142`	`1156`	`$name = (string) $name;`
	`1157`	`+ if (isset($this->buildParameters[$name])) {`
	`1158`	`+ return true;`
	`1159`	`+ }`
`1143`	`1160`
`1144`	`1161`	`return isset($this->parameters[$name]) \|\| isset($this->loadedDynamicParameters[$name]) \|\| array_key_exists($name, $this->parameters);`
`1145`	`1162`	`}`
`@@ -1156,13 +1173,19 @@ public function getParameterBag()`
`1156`	`1173`	`foreach ($this->loadedDynamicParameters as $name => $loaded) {`
`1157`	`1174`	`$parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);`
`1158`	`1175`	`}`
	`1176`	`+ foreach ($this->buildParameters as $name => $value) {`
	`1177`	`+ $parameters[$name] = $value;`
	`1178`	`+ }`
`1159`	`1179`	`$this->parameterBag = new FrozenParameterBag($parameters);`
`1160`	`1180`	`}`
`1161`	`1181`
`1162`	`1182`	`return $this->parameterBag;`
`1163`	`1183`	`}`
`1164`	`1184`
`1165`	`1185`	`EOF;`
	`1186`	`+ if (!$this->asFiles) {`
	`1187`	`+ $code = preg_replace('/^.buildParameters.\n.\n.\n/m', '', $code);`
	`1188`	`+ }`
`1166`	`1189`
`1167`	`1190`	`if ($dynamicPhp) {`
`1168`	`1191`	`$loadedDynamicParameters = $this->exportParameters(array_combine(array_keys($dynamicPhp), array_fill(0, count($dynamicPhp), false)), '', 8);`
`@@ -1483,16 +1506,21 @@ private function dumpValue($value, bool $interpolate = true): string`
`1483`	`1506`	`throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s)', $factory[1] ?: 'n/a'));`
`1484`	`1507`	`}`
`1485`	`1508`
	`1509`	`+ $class = $this->dumpValue($factory[0]);`
`1486`	`1510`	`if (is_string($factory[0])) {`
`1487`		`- return sprintf('%s::%s(%s)', $this->dumpLiteralClass($this->dumpValue($factory[0])), $factory[1], implode(', ', $arguments));`
	`1511`	`+ return sprintf('%s::%s(%s)', $this->dumpLiteralClass($class), $factory[1], implode(', ', $arguments));`
`1488`	`1512`	`}`
`1489`	`1513`
`1490`	`1514`	`if ($factory[0] instanceof Definition) {`
`1491`		`- return sprintf("[%s, '%s'](%s)", $this->dumpValue($factory[0]), $factory[1], implode(', ', $arguments));`
	`1515`	`+ if (0 === strpos($class, 'new ')) {`
	`1516`	`+ return sprintf('(%s)->%s(%s)', $class, $factory[1], implode(', ', $arguments));`
	`1517`	`+ }`
	`1518`	`+`
	`1519`	`+ return sprintf("[%s, '%s'](%s)", $class, $factory[1], implode(', ', $arguments));`
`1492`	`1520`	`}`
`1493`	`1521`
`1494`	`1522`	`if ($factory[0] instanceof Reference) {`
`1495`		`- return sprintf('%s->%s(%s)', $this->dumpValue($factory[0]), $factory[1], implode(', ', $arguments));`
	`1523`	`+ return sprintf('%s->%s(%s)', $class, $factory[1], implode(', ', $arguments));`
`1496`	`1524`	`}`
`1497`	`1525`	`}`
`1498`	`1526`
Original file line number	Diff line number	Diff line change
`@@ -307,6 +307,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;`
`307`	`307`	`*/`
`308`	`308`	`class ProjectServiceContainer extends Container`
`309`	`309`	`{`
	`310`	`+ private $buildParameters;`
`310`	`311`	`private $parameters;`
`311`	`312`	`private $targetDirs = array();`
`312`	`313`
`@@ -315,12 +316,13 @@ class ProjectServiceContainer extends Container`
`315`	`316`	`*/`
`316`	`317`	`protected $privates = array();`
`317`	`318`
`318`		`- public function __construct()`
	`319`	`+ public function __construct(array $buildParameters = array())`
`319`	`320`	`{`
`320`	`321`	`$dir = $this->targetDirs[0] = \dirname(__DIR__);`
`321`	`322`	`for ($i = 1; $i <= 5; ++$i) {`
`322`	`323`	`$this->targetDirs[$i] = $dir = \dirname($dir);`
`323`	`324`	`}`
	`325`	`+ $this->buildParameters = $buildParameters;`
`324`	`326`	`$this->parameters = $this->getDefaultParameters();`
`325`	`327`
`326`	`328`	`$this->services = $this->privates = array();`
`@@ -415,6 +417,9 @@ class ProjectServiceContainer extends Container`
`415`	`417`	`public function getParameter($name)`
`416`	`418`	`{`
`417`	`419`	`$name = (string) $name;`
	`420`	`+ if (isset($this->buildParameters[$name])) {`
	`421`	`+ return $this->buildParameters[$name];`
	`422`	`+ }`
`418`	`423`
`419`	`424`	`if (!(isset($this->parameters[$name]) \|\| isset($this->loadedDynamicParameters[$name]) \|\| array_key_exists($name, $this->parameters))) {`
`420`	`425`	`throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));`
`@@ -429,6 +434,9 @@ class ProjectServiceContainer extends Container`
`429`	`434`	`public function hasParameter($name)`
`430`	`435`	`{`
`431`	`436`	`$name = (string) $name;`
	`437`	`+ if (isset($this->buildParameters[$name])) {`
	`438`	`+ return true;`
	`439`	`+ }`
`432`	`440`
`433`	`441`	`return isset($this->parameters[$name]) \|\| isset($this->loadedDynamicParameters[$name]) \|\| array_key_exists($name, $this->parameters);`
`434`	`442`	`}`
`@@ -445,6 +453,9 @@ class ProjectServiceContainer extends Container`
`445`	`453`	`foreach ($this->loadedDynamicParameters as $name => $loaded) {`
`446`	`454`	`$parameters[$name] = $loaded ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);`
`447`	`455`	`}`
	`456`	`+ foreach ($this->buildParameters as $name => $value) {`
	`457`	`+ $parameters[$name] = $value;`
	`458`	`+ }`
`448`	`459`	`$this->parameterBag = new FrozenParameterBag($parameters);`
`449`	`460`	`}`
`450`	`461`
`@@ -499,6 +510,10 @@ if (!\class_exists(ProjectServiceContainer::class, false)) {`
`499`	`510`	`\class_alias(\Container%s\ProjectServiceContainer::class, ProjectServiceContainer::class, false);`
`500`	`511`	`}`
`501`	`512`
`502`		`-return new \Container%s\ProjectServiceContainer();`
	`513`	`+return new \Container%s\ProjectServiceContainer(array(`
	`514`	`+ 'container.build_hash' => '%s',`
	`515`	`+ 'container.build_id' => '%s',`
	`516`	`+ 'container.build_time' => %d,`
	`517`	`+));`
`503`	`518`
`504`	`519`	`)`
Original file line number	Diff line number	Diff line change
`@@ -79,14 +79,14 @@ protected function getTestServiceSubscriberService()`
`79`	`79`	`*/`
`80`	`80`	`protected function getFooServiceService()`
`81`	`81`	`{`
`82`		`- return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber([new \Symfony\Component\DependencyInjection\ServiceLocator(array('Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => function (): ?\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition {`
	`82`	`+ return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber((new \Symfony\Component\DependencyInjection\ServiceLocator(array('Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => function (): ?\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition {`
`83`	`83`	`return ($this->privates['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] ?? $this->privates['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition());`
`84`	`84`	`}, 'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\TestServiceSubscriber' => function (): \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber {`
`85`	`85`	`return ($this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] ?? $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber());`
`86`	`86`	`}, 'bar' => function (): \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition {`
`87`	`87`	`return ($this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] ?? $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber());`
`88`	`88`	`}, 'baz' => function (): ?\Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition {`
`89`	`89`	`return ($this->privates['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] ?? $this->privates['Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition());`
`90`		`- })), 'withContext']('foo_service', $this));`
	`90`	`+ })))->withContext('foo_service', $this));`
`91`	`91`	`}`
`92`	`92`	`}`