Merge branch '6.2' into 6.3

* 6.2:
  [Translation] Decouple TranslatorPathsPass from "debug." convention
  [VarDumper] Add a bit of test coverage
  [TwigBridge] Fix flagged malicious url
  [HttpClient] Fix encoding "+" in URLs
  [DependencyInjection] Fix dumping array of enums parameters
  Bump Symfony version to 6.2.8
  Update VERSION for 6.2.7
  Update CHANGELOG for 6.2.7
  Bump Symfony version to 5.4.22
  Update VERSION for 5.4.21
  Update CONTRIBUTORS for 5.4.21
  Update CHANGELOG for 5.4.21
  [Messenger] Fix TransportNamesStamp deserialization
  Removed @internal tag on TraceableAuthenticator::getAuthenticator()

Author: nicolas-grekas

Dumper/PhpDumper.php

@@ -90,6 +90,7 @@ class PhpDumper extends Dumper
     private array $locatedIds = [];
     private string $serviceLocatorTag;
     private array $exportedVariables = [];
+    private array $dynamicParameters = [];
     private string $baseClass;
     private string $class;
     private DumperInterface $proxyDumper;
@@ -135,6 +136,7 @@ public function dump(array $options = []): string|array
         $this->targetDirRegex = null;
         $this->inlinedRequires = [];
         $this->exportedVariables = [];
+        $this->dynamicParameters = [];
         $options = array_merge([
             'class' => 'ProjectServiceContainer',
             'base_class' => 'Container',
@@ -232,11 +234,12 @@ public function dump(array $options = []): string|array
             $this->preload = array_combine($options['preload_classes'], $options['preload_classes']);
         }
 
+        $code = $this->addDefaultParametersMethod();
         $code =
             $this->startClass($options['class'], $baseClass, $this->inlineFactories && $proxyClasses).
             $this->addServices($services).
             $this->addDeprecatedAliases().
-            $this->addDefaultParametersMethod()
+            $code
         ;
 
         $proxyClasses ??= $this->generateProxyClasses();
@@ -400,6 +403,7 @@ class %s extends {$options['class']}
         $this->circularReferences = [];
         $this->locatedIds = [];
         $this->exportedVariables = [];
+        $this->dynamicParameters = [];
         $this->preload = [];
 
         $unusedEnvs = [];
@@ -1570,6 +1574,7 @@ private function addDefaultParametersMethod(): string
 
             if ($hasEnum || preg_match("/\\\$container->(?:getEnv\('(?:[-.\w\\\\]*+:)*+\w++'\)|targetDir\.'')/", $export[1])) {
                 $dynamicPhp[$key] = sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);
+                $this->dynamicParameters[$key] = true;
             } else {
                 $php[] = sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);
             }
@@ -1988,20 +1993,18 @@ private function dumpLiteralClass(string $class): string
 
     private function dumpParameter(string $name): string
     {
-        if ($this->container->hasParameter($name)) {
-            $value = $this->container->getParameter($name);
-            $dumpedValue = $this->dumpValue($value, false);
+        if (!$this->container->hasParameter($name) || ($this->dynamicParameters[$name] ?? false)) {
+            return sprintf('$container->getParameter(%s)', $this->doExport($name));
+        }
 
-            if (!$value || !\is_array($value)) {
-                return $dumpedValue;
-            }
+        $value = $this->container->getParameter($name);
+        $dumpedValue = $this->dumpValue($value, false);
 
-            if (!preg_match("/\\\$container->(?:getEnv\('(?:[-.\w\\\\]*+:)*+\w++'\)|targetDir\.'')/", $dumpedValue)) {
-                return sprintf('$container->parameters[%s]', $this->doExport($name));
-            }
+        if (!$value || !\is_array($value)) {
+            return $dumpedValue;
         }
 
-        return sprintf('$container->getParameter(%s)', $this->doExport($name));
+        return sprintf('$container->parameters[%s]', $this->doExport($name));
     }
 
     private function getServiceCall(string $id, Reference $reference = null): string

Tests/Dumper/PhpDumperTest.php

@@ -1260,6 +1260,11 @@ public function testDumpHandlesEnumeration()
             ->register('foo', FooClassWithEnumAttribute::class)
             ->setPublic(true)
             ->addArgument(FooUnitEnum::BAR);
+        $container
+            ->register('bar', \stdClass::class)
+            ->setPublic(true)
+            ->addArgument('%unit_enum%')
+            ->addArgument('%enum_array%');
 
         $container->setParameter('unit_enum', FooUnitEnum::BAR);
         $container->setParameter('enum_array', [FooUnitEnum::BAR, FooUnitEnum::FOO]);
@@ -1277,6 +1282,11 @@ public function testDumpHandlesEnumeration()
         $this->assertSame(FooUnitEnum::BAR, $container->getParameter('unit_enum'));
         $this->assertSame([FooUnitEnum::BAR, FooUnitEnum::FOO], $container->getParameter('enum_array'));
         $this->assertStringMatchesFormat(<<<'PHP'
+%A
+    protected static function getBarService($container)
+    {
+        return $container->services['bar'] = new \stdClass(\Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum::BAR, $container->getParameter('enum_array'));
+    }
 %A
     private function getDynamicParameter(string $name)
     {