Merge branch '5.4' into 6.4

* 5.4:
  detect wrong e-mail validation modes
  read form values using the chain data accessor
  [Validator] Review Bulgarian (bg) translation
  Reviewed italian translation
  Fix french translation
  call substr() with integer offsets
  review: FR translation
  Update spanish and catalan translations
  Updated id=113 Arabic translation.
  symfony#53771 Updated validator Lithuanian translations
  review: translation RU
  [PropertyInfo] Fix PHPStan properties type in trait
  [Validator] review validators.lv.xlf
  Review translation

Author: xabbuh

src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php

@@ -12,7 +12,9 @@
 namespace Symfony\Component\Form\Extension\Core\DataAccessor;
 
 use Symfony\Component\Form\DataAccessorInterface;
+use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\Exception\AccessException;
+use Symfony\Component\Form\Extension\Core\DataMapper\DataMapper;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\PropertyAccess\Exception\AccessException as PropertyAccessException;
 use Symfony\Component\PropertyAccess\Exception\NoSuchIndexException;
@@ -51,15 +53,25 @@ public function setValue(object|array &$data, mixed $value, FormInterface $form)
             throw new AccessException('Unable to write the given value as no property path is defined.');
         }
 
+        $getValue = function () use ($data, $form, $propertyPath) {
+            $dataMapper = $this->getDataMapper($form);
+
+            if ($dataMapper instanceof DataMapper && null !== $dataAccessor = $dataMapper->getDataAccessor()) {
+                return $dataAccessor->getValue($data, $form);
+            }
+
+            return $this->getPropertyValue($data, $propertyPath);
+        };
+
         // If the field is of type DateTimeInterface and the data is the same skip the update to
         // keep the original object hash
-        if ($value instanceof \DateTimeInterface && $value == $this->getPropertyValue($data, $propertyPath)) {
+        if ($value instanceof \DateTimeInterface && $value == $getValue()) {
             return;
         }
 
         // If the data is identical to the value in $data, we are
         // dealing with a reference
-        if (!\is_object($data) || !$form->getConfig()->getByReference() || $value !== $this->getPropertyValue($data, $propertyPath)) {
+        if (!\is_object($data) || !$form->getConfig()->getByReference() || $value !== $getValue()) {
             $this->propertyAccessor->setValue($data, $propertyPath, $value);
         }
     }
@@ -93,4 +105,13 @@ private function getPropertyValue(object|array $data, PropertyPathInterface $pro
             return null;
         }
     }
+
+    private function getDataMapper(FormInterface $form): ?DataMapperInterface
+    {
+        do {
+            $dataMapper = $form->getConfig()->getDataMapper();
+        } while (null === $dataMapper && null !== $form = $form->getParent());
+
+        return $dataMapper;
+    }
 }

src/Symfony/Component/Form/Extension/Core/DataMapper/DataMapper.php

@@ -74,4 +74,12 @@ public function mapFormsToData(\Traversable $forms, mixed &$data): void
             }
         }
     }
+
+    /**
+     * @internal
+     */
+    public function getDataAccessor(): DataAccessorInterface
+    {
+        return $this->dataAccessor;
+    }
 }

src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/DataMapperTest.php

@@ -16,6 +16,8 @@
 use Symfony\Component\Form\Extension\Core\DataAccessor\PropertyPathAccessor;
 use Symfony\Component\Form\Extension\Core\DataMapper\DataMapper;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormConfigBuilder;
 use Symfony\Component\Form\FormFactoryBuilder;
@@ -403,6 +405,25 @@ public function testMapFormsToDataMapsDateTimeInstanceToArrayIfNotSetBefore()
 
         $this->assertEquals(['date' => new \DateTime('2022-08-04', new \DateTimeZone('UTC'))], $form->getData());
     }
+
+    public function testMapFormToDataWithOnlyGetterConfigured()
+    {
+        $person = new DummyPerson('foo');
+        $form = (new FormFactoryBuilder())
+            ->getFormFactory()
+            ->createBuilder(FormType::class, $person)
+            ->add('name', TextType::class, [
+                'getter' => function (DummyPerson $person) {
+                    return $person->myName();
+                },
+            ])
+            ->getForm();
+        $form->submit([
+            'name' => 'bar',
+        ]);
+
+        $this->assertSame('bar', $person->myName());
+    }
 }
 
 class SubmittedForm extends Form
@@ -439,4 +460,9 @@ public function rename($name): void
     {
         $this->name = $name;
     }
+
+    public function setName($name): void
+    {
+        $this->name = $name;
+    }
 }

src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php

@@ -232,6 +232,14 @@ private function getDocBlockFromProperty(string $class, string $property): ?arra
             return null;
         }
 
+        $reflector = $reflectionProperty->getDeclaringClass();
+
+        foreach ($reflector->getTraits() as $trait) {
+            if ($trait->hasProperty($property)) {
+                return $this->getDocBlockFromProperty($trait->getName(), $property);
+            }
+        }
+
         // Type can be inside property docblock as `@var`
         $rawDocNode = $reflectionProperty->getDocComment();
         $phpDocNode = $rawDocNode ? $this->getPhpDocNode($rawDocNode) : null;

src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php

@@ -21,6 +21,7 @@
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Php80Dummy;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Php80PromotedDummy;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\RootDummy\RootDummyItem;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\AnotherNamespace\DummyInAnotherNamespace;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\DummyUsedInTrait;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\DummyUsingTrait;
 use Symfony\Component\PropertyInfo\Type;
@@ -306,6 +307,7 @@ public static function propertiesDefinedByTraitsProvider(): array
             ['propertyInTraitPrimitiveType', new Type(Type::BUILTIN_TYPE_STRING)],
             ['propertyInTraitObjectSameNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, DummyUsedInTrait::class)],
             ['propertyInTraitObjectDifferentNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)],
+            ['dummyInAnotherNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, DummyInAnotherNamespace::class)],
         ];
     }
 

src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/AnotherNamespace/DummyInAnotherNamespace.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\AnotherNamespace;
+
+class DummyInAnotherNamespace
+{
+}

src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/AnotherNamespace/DummyTraitInAnotherNamespace.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\AnotherNamespace;
+
+trait DummyTraitInAnotherNamespace
+{
+    /**
+     * @var DummyInAnotherNamespace
+     */
+    public $dummyInAnotherNamespace;
+}

src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsingTrait.php

@@ -11,7 +11,10 @@
 
 namespace Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage;
 
+use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\AnotherNamespace\DummyTraitInAnotherNamespace;
+
 class DummyUsingTrait
 {
     use DummyTrait;
+    use DummyTraitInAnotherNamespace;
 }

src/Symfony/Component/Validator/Constraints/Email.php

@@ -68,6 +68,10 @@ public function __construct(
             throw new InvalidArgumentException('The "mode" parameter value is not valid.');
         }
 
+        if (null !== $mode && !\in_array($mode, self::$validationModes, true)) {
+            throw new InvalidArgumentException('The "mode" parameter value is not valid.');
+        }
+
         parent::__construct($options, $groups, $payload);
 
         $this->message = $message ?? $this->message;

src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf

@@ -440,7 +440,7 @@
             </trans-unit>
             <trans-unit id="113">
                 <source>This URL is missing a top-level domain.</source>
-                <target state="needs-review-translation">هذا الرابط يفتقر إلى نطاق أعلى مستوى.</target>
+                <target>هذا الرابط يفتقر إلى نطاق المستوى الأعلى.</target>
             </trans-unit>
         </body>
     </file>