Merge branch '5.4' into 6.0

* 5.4:
  Make FormErrorIterator generic
  [symfony/mailjet-mailer] Fix invalid mailjet error managment
  typehint of DkimOptions algorithm wrong
  Remove extra space in NotificationEmail
  Fix the usage of the Valid constraints in array-based forms
  Fix return value of `NullToken::getUser()`
  [DI] fix `ServiceSubscriberTrait` bug where parent has `__call()`
  [HttpClient] Fix reading proxy settings from dotenv when curl is used
  [Process] Don't return executable directories in PhpExecutableFinder
  Center icons vertically in trace list

Author: derrabus

Extension/Validator/Constraints/FormValidator.php

@@ -113,7 +113,7 @@ public function validate(mixed $form, Constraint $formConstraint)
                 foreach ($constraints as $constraint) {
                     // For the "Valid" constraint, validate the data in all groups
                     if ($constraint instanceof Valid) {
-                        if (\is_object($data)) {
+                        if (\is_object($data) || \is_array($data)) {
                             $validator->atPath('data')->validate($data, $constraint, $groups);
                         }
 

FormErrorIterator.php

@@ -29,9 +29,11 @@
  *
  * @author Bernhard Schussek <[email protected]>
  *
- * @implements \ArrayAccess<int, FormError|FormErrorIterator>
- * @implements \RecursiveIterator<int, FormError|FormErrorIterator>
- * @implements \SeekableIterator<int, FormError|FormErrorIterator>
+ * @template T of FormError|FormErrorIterator
+ *
+ * @implements \ArrayAccess<int, T>
+ * @implements \RecursiveIterator<int, T>
+ * @implements \SeekableIterator<int, T>
  */
 class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \ArrayAccess, \Countable
 {
@@ -41,10 +43,14 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
     public const INDENTATION = '    ';
 
     private $form;
+
+    /**
+     * @var list<T>
+     */
     private array $errors;
 
     /**
-     * @param list<FormError|self> $errors
+     * @param list<T> $errors
      *
      * @throws InvalidArgumentException If the errors are invalid
      */
@@ -72,7 +78,7 @@ public function __toString(): string
                 $string .= 'ERROR: '.$error->getMessage()."\n";
             } else {
                 /* @var self $error */
-                $string .= $error->form->getName().":\n";
+                $string .= $error->getForm()->getName().":\n";
                 $string .= self::indent((string) $error);
             }
         }
@@ -90,6 +96,8 @@ public function getForm(): FormInterface
 
     /**
      * Returns the current element of the iterator.
+     *
+     * @return T An error or an iterator containing nested errors
      */
     public function current(): FormError|self
     {
@@ -146,6 +154,8 @@ public function offsetExists(mixed $position): bool
      *
      * @param int $position The position
      *
+     * @return T
+     *
      * @throws OutOfBoundsException If the given position does not exist
      */
     public function offsetGet(mixed $position): FormError|self
@@ -192,7 +202,10 @@ public function getChildren(): self
             throw new LogicException(sprintf('The current element is not iterable. Use "%s" to get the current element.', self::class.'::current()'));
         }
 
-        return current($this->errors);
+        /** @var self $children */
+        $children = current($this->errors);
+
+        return $children;
     }
 
     /**

Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php

@@ -15,6 +15,7 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Exception\TransformationFailedException;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
@@ -321,6 +322,35 @@ public function testCascadeValidationToChildFormsWithTwoValidConstraints2()
         $this->assertSame('children[author].data.email', $violations[1]->getPropertyPath());
     }
 
+    public function testCascadeValidationToArrayChildForm()
+    {
+        $form = $this->formFactory->create(FormType::class, null, [
+            'data_class' => Review::class,
+        ])
+            ->add('title')
+            ->add('customers', CollectionType::class, [
+                'mapped' => false,
+                'entry_type' => CustomerType::class,
+                'allow_add' => true,
+                'constraints' => [new Valid()],
+            ]);
+
+        $form->submit([
+            'title' => 'Sample Title',
+            'customers' => [
+                ['email' => null],
+            ],
+        ]);
+
+        $violations = $this->validator->validate($form);
+
+        $this->assertCount(2, $violations);
+        $this->assertSame('This value should not be blank.', $violations[0]->getMessage());
+        $this->assertSame('data.rating', $violations[0]->getPropertyPath());
+        $this->assertSame('This value should not be blank.', $violations[1]->getMessage());
+        $this->assertSame('children[customers].data[0].email', $violations[1]->getPropertyPath());
+    }
+
     public function testCascadeValidationToChildFormsUsingPropertyPathsValidatedInSequence()
     {
         $form = $this->formFactory->create(FormType::class, null, [