fix(autorefresh): don't use clone to get the id values

Author: nikophil

src/Configuration.php

@@ -111,13 +111,17 @@ public function inADataProvider(): bool
         return $this->bootedForDataProvider;
     }
 
-    public static function instance(): self
-    {
+    public static function instance(
+        /** @internal */
+        bool $skipCheckFactoriesTrait = false,
+    ): self {
         if (!self::$instance) {
             throw new FoundryNotBooted();
         }
 
-        FactoriesTraitNotUsed::throwIfComingFromKernelTestCaseWithoutFactoriesTrait();
+        if (!$skipCheckFactoriesTrait) {
+            FactoriesTraitNotUsed::throwIfComingFromKernelTestCaseWithoutFactoriesTrait();
+        }
 
         return \is_callable(self::$instance) ? (self::$instance)() : self::$instance;
     }

src/Persistence/PersistenceManager.php

@@ -148,18 +148,16 @@ public function flush(ObjectManager $om): void
      *
      * @param T $object
      */
-    public function autorefresh(object $object, object $clone): void
+    public function autorefresh(object $object, mixed $id, object $clone): void
     {
         $strategy = $this->strategyFor($object::class);
         $om = $strategy->objectManagerFor($object::class);
 
-        $id = $strategy->getIdentifierValues($clone);
-
         if ($id) {
             try {
                 $om->refresh($object);
 
-                if ($strategy->getIdentifierValues($object)) {
+                if ($this->getIdentifierValues($object)) {
                     // no identifier values means the object no longer exists
                     return;
                 }
@@ -398,6 +396,11 @@ public function resetDatabaseManager(): ResetDatabaseManager
         return $this->resetDatabaseManager;
     }
 
+    public function getIdentifierValues(object $object): mixed
+    {
+        return $this->strategyFor($object::class)->getIdentifierValues($object);
+    }
+
     public static function isOrmOnly(): bool
     {
         static $isOrmOnly = null;

src/Persistence/Proxy/PersistedObjectsTracker.php

@@ -62,9 +62,10 @@ static function(\WeakReference $weakRef) {
                         return \WeakReference::create($object);
                     }
 
+                    $id = Configuration::instance(skipCheckFactoriesTrait: true)->persistence()->getIdentifierValues($object);
                     $clone = clone $object;
-                    $reflector->resetAsLazyGhost($object, function($object) use ($clone) {
-                        Configuration::instance()->persistence()->autorefresh($object, $clone);
+                    $reflector->resetAsLazyGhost($object, function($object) use ($id, $clone) {
+                        Configuration::instance()->persistence()->autorefresh($object, $id, $clone);
                     });
 
                     return \WeakReference::create($object);

tests/Fixture/Entity/EdgeCases/EntityWithCloneMethod.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Zenstruck\Foundry\Tests\Fixture\Entity\EdgeCases;
+
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+#[ORM\Table('entity_with_clone_method')]
+class EntityWithCloneMethod
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: 'integer')]
+    public int|null $id = null;
+
+    #[ORM\Column(nullable: true)]
+    public string|null $prop = null;
+
+    public function __clone()
+    {
+        $this->id = null;
+    }
+}

tests/Integration/ORM/AutoRefreshTest.php

@@ -26,13 +26,15 @@
 use Zenstruck\Foundry\Tests\Fixture\DoctrineCascadeRelationship\ChangesEntityRelationshipCascadePersist;
 use Zenstruck\Foundry\Tests\Fixture\DoctrineCascadeRelationship\UsingRelationships;
 use Zenstruck\Foundry\Tests\Fixture\Entity\Contact;
+use Zenstruck\Foundry\Tests\Fixture\Entity\EdgeCases\EntityWithCloneMethod;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\Address\AddressFactory;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\Category\CategoryFactory;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\Contact\ContactFactory;
 use Zenstruck\Foundry\Tests\Fixture\Factories\Entity\GenericEntityFactory;
 use Zenstruck\Foundry\Tests\Integration\Persistence\AutoRefreshTestCase;
 use Zenstruck\Foundry\Tests\Integration\RequiresORM;
 
+use function Zenstruck\Foundry\Persistence\persistent_factory;
 use function Zenstruck\Foundry\Persistence\refresh_all;
 
 /**
@@ -123,7 +125,6 @@ public function it_can_refresh_objects_with_relationships(): void
     }
 
     #[Test]
-    #[IgnorePhpunitWarnings(EdgeCasesRelationshipTest::DATA_PROVIDER_WARNING_REGEX)]
     public function it_can_refresh_with_doctrine_proxies(): void
     {
         $contact = ContactFactory::createOne();
@@ -151,6 +152,22 @@ public function it_can_refresh_with_doctrine_proxies(): void
         self::assertSame('foo', $category->getName());
     }
 
+    #[Test]
+    public function it_can_refresh_entity_which_removes_its_id_in_clone(): void
+    {
+        $entity = persistent_factory(EntityWithCloneMethod::class)->create();
+        $entityId = $entity->id;
+
+        $this->objectManager()->getConnection()->executeQuery('UPDATE entity_with_clone_method SET prop = \'foo\' WHERE id = ?', [$entity->id]);
+
+        self::ensureKernelShutdown();
+
+        self::assertTrue((new \ReflectionClass($entity))->isUninitializedLazyObject($entity));
+
+        self::assertSame('foo', $entity->prop);
+        self::assertSame($entityId, $entity->id);
+    }
+
     protected static function factory(): PersistentObjectFactory
     {
         return GenericEntityFactory::new();

tests/Integration/Persistence/AutoRefreshTestCase.php

@@ -62,6 +62,7 @@ public function it_can_refresh_after_kernel_shutdown(): void
 
         // service reset did clear the EM, thus the object is not managed anymore
         self::assertFalse($this->objectManager()->contains($object));
+        self::assertSame($objectId, $object->id);
     }
 
     #[Test]
@@ -80,6 +81,9 @@ public function it_can_refresh_many_objects(): void
 
         self::assertSame('foo', $object1->getProp1());
         self::assertSame('foo', $object2->getProp1());
+
+        self::assertSame($objectId1, $object1->id);
+        self::assertSame($objectId2, $object2->id);
     }
 
     #[Test]
@@ -88,6 +92,8 @@ public function it_can_refresh_after_update_with_browser(): void
         $client = self::createClient();
 
         $object = $this->factory()->create();
+        $objectId = $object->id;
+
         self::assertSame('default1', $object->getProp1());
         self::assertFalse((new \ReflectionClass($object))->isUninitializedLazyObject($object));
 
@@ -100,6 +106,8 @@ public function it_can_refresh_after_update_with_browser(): void
         assert_persisted($object);
         self::assertSame('foo', $object->getProp1());
         self::assertFalse((new \ReflectionClass($object))->isUninitializedLazyObject($object));
+
+        self::assertSame($objectId, $object->id);
     }
 
     #[Test]