review

soyuka · soyuka · commit 60215c69be42 · 2025-11-04T15:48:42.000+01:00
diff --git a/src/Symfony/Component/ObjectMapper/ObjectMapper.php b/src/Symfony/Component/ObjectMapper/ObjectMapper.php
@@ -32,7 +32,7 @@ final class ObjectMapper implements ObjectMapperInterface, ObjectMapperAwareInte
     /**
      * Tracks recursive references.
      */
-    private ?\WeakMap $objectMap = null;
+    private \WeakMap $objectMap;
 
     public function __construct(
         private readonly ObjectMapperMetadataFactoryInterface $metadataFactory = new ReflectionObjectMapperMetadataFactory(),
@@ -227,17 +227,15 @@ private function getSourceValue(object $source, object $target, mixed $value, \W
                 $value = $target;
             } elseif ($objectMap->offsetExists($value)) {
                 $value = $objectMap[$value];
+            } elseif (\PHP_VERSION_ID < 80400) {
+                return ($this->objectMapper ?? $this)->map($value, $mapTo->target);
             } else {
-                if (\PHP_VERSION_ID >= 80400) {
-                    $refl = new \ReflectionClass($mapTo->target);
-                    $mapper = $this->objectMapper ?? $this;
-
-                    return $refl->newLazyProxy(static function () use ($mapper, $value, $objectMap, $mapTo) {
-                        return $objectMap[$value] = $mapper->map($value, $mapTo->target);
-                    });
-                }
+                $refl = new \ReflectionClass($mapTo->target);
+                $mapper = $this->objectMapper ?? $this;
 
-                return ($this->objectMapper ?? $this)->map($value, $mapTo->target);
+                return $refl->newLazyProxy(static function () use ($mapper, $value, $objectMap, $mapTo) {
+                    return $objectMap[$value] = $mapper->map($value, $mapTo->target);
+                });
             }
         }
 
