Tweak merge

nicolas-grekas · nicolas-grekas · commit 5a2c213c54fa · 2025-07-21T19:10:04.000+02:00
diff --git a/src/Symfony/Component/ObjectMapper/ObjectMapper.php b/src/Symfony/Component/ObjectMapper/ObjectMapper.php
@@ -319,7 +319,7 @@ private function getSourceReflectionClass(object $source, \ReflectionClass $targ
 
         if ($source instanceof LazyObjectInterface) {
             $source->initializeLazyObject();
-        } elseif (\PHP_VERSION_ID >= 80400 && $refl->isUninitializedLazyObject($source)) {
+        } elseif ($refl->isUninitializedLazyObject($source)) {
             $refl->initializeLazyObject($source);
         }
 
diff --git a/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php b/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php
@@ -379,9 +379,6 @@ public function testMapInitializesLazyObject()
         $this->assertTrue($lazy->isLazyObjectInitialized());
     }
 
-    /**
-     * @requires PHP 8.4
-     */
     public function testMapInitializesNativePhp84LazyObject()
     {
         $initialized = false;

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ private function getSourceReflectionClass(object $source, \ReflectionClass $targ`
`319`	`319`
`320`	`320`	`if ($source instanceof LazyObjectInterface) {`
`321`	`321`	`$source->initializeLazyObject();`
`322`		`- } elseif (\PHP_VERSION_ID >= 80400 && $refl->isUninitializedLazyObject($source)) {`
	`322`	`+ } elseif ($refl->isUninitializedLazyObject($source)) {`
`323`	`323`	`$refl->initializeLazyObject($source);`
`324`	`324`	`}`
`325`	`325`
Original file line number	Diff line number	Diff line change
`@@ -379,9 +379,6 @@ public function testMapInitializesLazyObject()`
`379`	`379`	`$this->assertTrue($lazy->isLazyObjectInitialized());`
`380`	`380`	`}`
`381`	`381`
`382`		`- /**`
`383`		`- * @requires PHP 8.4`
`384`		`- */`
`385`	`382`	`public function testMapInitializesNativePhp84LazyObject()`
`386`	`383`	`{`
`387`	`384`	`$initialized = false;`