[VarExporter] Initialize ghosts before calling their __clone method if they have skipped properties

MatTheCat · MatTheCat · commit 2b543bd9f9c3 · 2023-07-06T09:29:15.000+02:00
diff --git a/src/Symfony/Component/VarExporter/LazyGhostTrait.php b/src/Symfony/Component/VarExporter/LazyGhostTrait.php
@@ -332,6 +332,10 @@ public function __clone(): void
         }
 
         if ((Registry::$parentMethods[self::class] ??= Registry::getParentMethods(self::class))['clone']) {
+            if ($this->lazyObjectState->skippedProperties) {
+                $this->initializeLazyObject();
+            }
+
             parent::__clone();
         }
     }
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyGhost/MagicCloneClass.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyGhost/MagicCloneClass.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\VarExporter\Tests\Fixtures\LazyGhost;
+
+class MagicCloneClass
+{
+    public ?int $id;
+    public bool $cloned;
+
+    public function __clone()
+    {
+        $this->id = null;
+        $this->cloned = true;
+    }
+}
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyGhost/MagicCloneClassProxy.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/LazyGhost/MagicCloneClassProxy.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\VarExporter\Tests\Fixtures\LazyGhost;
+
+use Symfony\Component\VarExporter\LazyGhostTrait;
+use Symfony\Component\VarExporter\LazyObjectInterface;
+
+class MagicCloneClassProxy extends MagicCloneClass  implements LazyObjectInterface
+{
+    use LazyGhostTrait {
+        __clone as private __doClone;
+    }
+
+    public function __clone()
+    {
+        $this->__doClone();
+    }
+}
diff --git a/src/Symfony/Component/VarExporter/Tests/LazyGhostTraitTest.php b/src/Symfony/Component/VarExporter/Tests/LazyGhostTraitTest.php
@@ -17,6 +17,7 @@
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyGhost\ChildMagicClass;
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyGhost\ChildStdClass;
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyGhost\ChildTestClass;
+use Symfony\Component\VarExporter\Tests\Fixtures\LazyGhost\MagicCloneClassProxy;
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyGhost\LazyClass;
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyGhost\MagicClass;
 use Symfony\Component\VarExporter\Tests\Fixtures\LazyGhost\ReadOnlyClass;
@@ -109,6 +110,23 @@ public function testClone()
         $this->assertTrue($clone->resetLazyObject());
     }
 
+    public function testCloneIsInitializedIfNeeded()
+    {
+        $instance = MagicCloneClassProxy::createLazyGhost(function (MagicCloneClassProxy $ghost) {
+            if (1 === $ghost->id) {
+                $ghost->cloned = false;
+            } else {
+                $this->fail('Ghost must be initialized before its __clone method is called.');
+            }
+        }, ['id' => true]);
+        $instance->id = 1;
+
+        $clone = clone $instance;
+
+        $this->assertNull($clone->id);
+        $this->assertTrue($clone->cloned);
+    }
+
     public function testSerialize()
     {
         $instance = ChildTestClass::createLazyGhost(function (ChildTestClass $ghost) {

Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,10 @@ public function __clone(): void`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`if ((Registry::$parentMethods[self::class] ??= Registry::getParentMethods(self::class))['clone']) {`
	`335`	`+ if ($this->lazyObjectState->skippedProperties) {`
	`336`	`+ $this->initializeLazyObject();`
	`337`	`+ }`
	`338`	`+`
`335`	`339`	`parent::__clone();`
`336`	`340`	`}`
`337`	`341`	`}`