Merge branch '4.4' into 5.0

* 4.4:
  [DependencyInjection][CheckTypeDeclarationsPass] Handle unresolved parameters pointing to environment variables
  switch the context when validating nested forms
  remove unused param from validator service config
  Fix typo
  [HttpKernel] Fix regression where Store does not return response body correctly
  rework form validator tests
  Update AbstractController.php

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php

@@ -197,7 +197,7 @@ protected function file($file, string $fileName = null, string $disposition = Re
      *
      * @throws \LogicException
      */
-    protected function addFlash(string $type, string $message): void
+    protected function addFlash(string $type, $message): void
     {
         if (!$this->container->has('session')) {
             throw new \LogicException('You can not use the addFlash method if sessions are disabled. Enable them in "config/packages/framework.yaml".');

src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml

@@ -5,7 +5,6 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="validator.mapping.cache.prefix" />
         <parameter key="validator.mapping.cache.file">%kernel.cache_dir%/validation.php</parameter>
     </parameters>
 

src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php

@@ -199,7 +199,9 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar
         } elseif (\is_string($value)) {
             if ('%' === ($value[0] ?? '') && preg_match('/^%([^%]+)%$/', $value, $match)) {
                 $value = $this->container->getParameter(substr($value, 1, -1));
-            } elseif ($envPlaceholderUniquePrefix && false !== strpos($value, 'env_')) {
+            }
+
+            if ($envPlaceholderUniquePrefix && \is_string($value) && false !== strpos($value, 'env_')) {
                 // If the value is an env placeholder that is either mixed with a string or with another env placeholder, then its resolved value will always be a string, so we don't need to resolve it.
                 // We don't need to change the value because it is already a string.
                 if ('' === preg_replace('/'.$envPlaceholderUniquePrefix.'_\w+_[a-f0-9]{32}/U', '', $value, -1, $c) && 1 === $c) {

src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php

@@ -780,17 +780,27 @@ public function testExpressionLanguageWithSyntheticService()
 
     public function testProcessResolveParameters()
     {
-        $container = new ContainerBuilder();
+        putenv('ARRAY={"foo":"bar"}');
+
+        $container = new ContainerBuilder(new EnvPlaceholderParameterBag([
+            'env_array_param' => '%env(json:ARRAY)%',
+        ]));
         $container->setParameter('array_param', ['foobar']);
         $container->setParameter('string_param', 'ccc');
 
-        $container
-            ->register('foobar', BarMethodCall::class)
+        $definition = $container->register('foobar', BarMethodCall::class);
+        $definition
             ->addMethodCall('setArray', ['%array_param%'])
             ->addMethodCall('setString', ['%string_param%']);
 
+        (new ResolveParameterPlaceHoldersPass())->process($container);
+
+        $definition->addMethodCall('setArray', ['%env_array_param%']);
+
         (new CheckTypeDeclarationsPass(true))->process($container);
 
         $this->addToAssertionCount(1);
+
+        putenv('ARRAY=');
     }
 }

src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php

@@ -90,6 +90,7 @@ public function validate($form, Constraint $formConstraint)
                             // in different steps without breaking early enough
                             $this->resolvedGroups[$field] = (array) $group;
                             $fieldFormConstraint = new Form();
+                            $this->context->setNode($this->context->getValue(), $field, $this->context->getMetadata(), $this->context->getPropertyPath());
                             $validator->atPath(sprintf('children[%s]', $field->getName()))->validate($field, $fieldFormConstraint);
                         }
                     }
@@ -135,6 +136,7 @@ public function validate($form, Constraint $formConstraint)
                     if ($field->isSubmitted()) {
                         $this->resolvedGroups[$field] = $groups;
                         $fieldFormConstraint = new Form();
+                        $this->context->setNode($this->context->getValue(), $field, $this->context->getMetadata(), $this->context->getPropertyPath());
                         $validator->atPath(sprintf('children[%s]', $field->getName()))->validate($field, $fieldFormConstraint);
                     }
                 }