Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit b30577de8c85 · 2025-07-21T19:08:48.000+02:00
* 7.4:
  [FrameworkBundle] Don't use Email::VALIDATION_MODES in Configuration
  [ObjectMapper] initialize lazy objects
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -48,7 +48,6 @@
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\TypeInfo\Type;
 use Symfony\Component\Uid\Factory\UuidFactory;
-use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Validation;
 use Symfony\Component\Webhook\Controller\WebhookController;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
@@ -1078,7 +1077,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
                             ->validate()->castToArray()->end()
                         ->end()
                         ->scalarNode('translation_domain')->defaultValue('validators')->end()
-                        ->enumNode('email_validation_mode')->values(Email::VALIDATION_MODES)->defaultValue('html5')->end()
+                        ->enumNode('email_validation_mode')->values(['html5', 'html5-allow-no-tld', 'strict'])->defaultValue('html5')->end()
                         ->arrayNode('mapping')
                             ->addDefaultsIfNotSet()
                             ->fixXmlConfig('path')
diff --git a/src/Symfony/Component/ObjectMapper/ObjectMapper.php b/src/Symfony/Component/ObjectMapper/ObjectMapper.php
@@ -20,6 +20,7 @@
 use Symfony\Component\ObjectMapper\Metadata\ReflectionObjectMapperMetadataFactory;
 use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException as PropertyAccessorNoSuchPropertyException;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
+use Symfony\Component\VarExporter\LazyObjectInterface;
 
 /**
  * Object to object mapper.
@@ -316,6 +317,12 @@ private function getSourceReflectionClass(object $source, \ReflectionClass $targ
             throw new MappingException($e->getMessage(), $e->getCode(), $e);
         }
 
+        if ($source instanceof LazyObjectInterface) {
+            $source->initializeLazyObject();
+        } elseif (\PHP_VERSION_ID >= 80400 && $refl->isUninitializedLazyObject($source)) {
+            $refl->initializeLazyObject($source);
+        }
+
         if ($metadata) {
             return $refl;
         }
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/LazyFoo.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/LazyFoo.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ObjectMapper\Tests\Fixtures;
+
+use Symfony\Component\VarExporter\LazyGhostTrait;
+use Symfony\Component\VarExporter\LazyObjectInterface;
+
+class LazyFoo extends \stdClass implements LazyObjectInterface
+{
+    use LazyGhostTrait;
+
+    public string $name = 'foo';
+}
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MyProxy.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MyProxy.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ObjectMapper\Tests\Fixtures;
+
+class MyProxy
+{
+    public string $name;
+}
diff --git a/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php b/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php
@@ -41,6 +41,7 @@
 use Symfony\Component\ObjectMapper\Tests\Fixtures\InstanceCallback\B as InstanceCallbackB;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\InstanceCallbackWithArguments\A as InstanceCallbackWithArgumentsA;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\InstanceCallbackWithArguments\B as InstanceCallbackWithArgumentsB;
+use Symfony\Component\ObjectMapper\Tests\Fixtures\LazyFoo;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MapStruct\AToBMapper;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MapStruct\MapStructMapperMetadataFactory;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MapStruct\Source;
@@ -52,6 +53,7 @@
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargetProperty\C as MultipleTargetPropertyC;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargets\A as MultipleTargetsA;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargets\C as MultipleTargetsC;
+use Symfony\Component\ObjectMapper\Tests\Fixtures\MyProxy;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\PromotedConstructor\Source as PromotedConstructorSource;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\PromotedConstructor\Target as PromotedConstructorTarget;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\Recursion\AB;
@@ -369,6 +371,38 @@ public static function objectMapperProvider(): iterable
         yield [new ObjectMapper(new ReflectionObjectMapperMetadataFactory(), PropertyAccess::createPropertyAccessor())];
     }
 
+    public function testMapInitializesLazyObject()
+    {
+        $lazy = new LazyFoo();
+        $mapper = new ObjectMapper();
+        $mapper->map($lazy, \stdClass::class);
+        $this->assertTrue($lazy->isLazyObjectInitialized());
+    }
+
+    /**
+     * @requires PHP 8.4
+     */
+    public function testMapInitializesNativePhp84LazyObject()
+    {
+        $initialized = false;
+        $initializer = function () use (&$initialized) {
+            $initialized = true;
+
+            $p = new MyProxy();
+            $p->name = 'test';
+
+            return $p;
+        };
+
+        $r = new \ReflectionClass(MyProxy::class);
+        $lazyObj = $r->newLazyProxy($initializer);
+        $this->assertFalse($initialized);
+        $mapper = new ObjectMapper();
+        $d = $mapper->map($lazyObj, MyProxy::class);
+        $this->assertSame('test', $d->name);
+        $this->assertTrue($initialized);
+    }
+
     public function testDecorateObjectMapper()
     {
         $mapper = new ObjectMapper();
diff --git a/src/Symfony/Component/ObjectMapper/composer.json b/src/Symfony/Component/ObjectMapper/composer.json
@@ -20,7 +20,8 @@
         "psr/container": "^2.0"
     },
     "require-dev": {
-        "symfony/property-access": "^7.4|^8.0"
+        "symfony/property-access": "^7.4|^8.0",
+        "symfony/var-exporter": "^7.4|^8.0"
     },
     "autoload": {
         "psr-4": {
