Restore document proxy state to uninitialized on load exception

Author: notrix

lib/Doctrine/ODM/MongoDB/Proxy/Factory/StaticProxyFactory.php

@@ -108,7 +108,14 @@ private function createInitializer(
             $initializer         = null;
             $identifier          = $metadata->getIdentifierValue($ghostObject);
 
-            if (! $documentPersister->load(['_id' => $identifier], $ghostObject)) {
+            try {
+                $document = $documentPersister->load(['_id' => $identifier], $ghostObject);
+            } catch (\Exception $exception) {
+                $initializer = $originalInitializer;
+
+                throw $exception;
+            }
+            if (! $document) {
                 $initializer = $originalInitializer;
 
                 if (! $this->lifecycleEventManager->documentNotFound($ghostObject, $identifier)) {

tests/Doctrine/ODM/MongoDB/Tests/Proxy/Factory/StaticProxyFactoryTest.php

@@ -0,0 +1,81 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Doctrine\ODM\MongoDB\Tests\Proxy\Factory;
+
+use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\ODM\MongoDB\LockException;
+use Doctrine\ODM\MongoDB\Proxy\Factory\StaticProxyFactory;
+use Doctrine\ODM\MongoDB\Tests\BaseTest;
+use Documents\PaymentProvider;
+use MongoDB\Client;
+use MongoDB\Collection;
+use MongoDB\Database;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class StaticProxyFactoryTest extends BaseTest
+{
+    /**
+     * @var Client|MockObject
+     */
+    private Client $client;
+
+    private StaticProxyFactory $proxyFactory;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->proxyFactory = new StaticProxyFactory($this->dm);
+    }
+
+    public function testProxyInitializeWithException()
+    {
+        $collection = $this->createMock(Collection::class);
+        $database = $this->createMock(Database::class);
+
+        $this->client->expects($this->once())
+            ->method('selectDatabase')
+            ->willReturn($database);
+
+        $database->expects($this->once())
+            ->method('selectCollection')
+            ->willReturn($collection);
+
+        $collection->expects($this->once())
+            ->method('findOne')
+            ->willThrowException(LockException::lockFailed(null));
+
+        $uow = $this->dm->getUnitOfWork();
+
+        $metadata = $this->dm->getClassMetadata(PaymentProvider::class);
+
+        $proxy = $this->proxyFactory->getProxy($metadata, '123');
+        $uow->registerManaged($proxy, '123', []);
+
+        try {
+            $proxy->getTitle();
+        } catch (LockException $exception) {
+            // Expected exception. Ignoring
+        }
+
+        $uow->computeChangeSets();
+
+        $this->assertFalse($uow->isScheduledForUpdate($proxy), 'Proxy should not be scheduled for update');
+        $this->assertFalse($proxy->isProxyInitialized(), 'Proxy should not be initialized');
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    protected function createTestDocumentManager(): DocumentManager
+    {
+        $config = $this->getConfiguration();
+
+        $this->client = $this->createMock(Client::class);
+
+        return DocumentManager::create($this->client, $config);
+    }
+}

tests/Documents/PaymentProvider.php

@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Documents;
+
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+
+/** @ODM\Document */
+class PaymentProvider
+{
+    /**
+     * @ODM\Id
+     *
+     * @var string|null
+     */
+    public $id;
+
+    /**
+     * @ODM\Field(type="string")
+     *
+     * @var string|null
+     */
+    private $title;
+
+    /**
+     * @ODM\Field(type="boolean")
+     *
+     * @var bool
+     */
+    private $active = true;
+
+    /**
+     * @ODM\Field(type="hash")
+     *
+     * @var array<string, string>
+     */
+    private $configuration = [];
+
+    public function getId(): ?string
+    {
+        return $this->id;
+    }
+
+    public function getTitle(): ?string
+    {
+        return $this->title;
+    }
+
+    public function setTitle(string $title): void
+    {
+        $this->title = $title;
+    }
+
+    public function isActive(): bool
+    {
+        return $this->active;
+    }
+
+    public function setActive(bool $active): self
+    {
+        $this->active = $active;
+
+        return $this;
+    }
+
+    /** @return array<string, string> */
+    public function getConfiguration(): array
+    {
+        return $this->configuration;
+    }
+
+    /** @param array<string, string> $configuration */
+    public function setConfiguration(array $configuration): self
+    {
+        $this->configuration = $configuration;
+
+        return $this;
+    }
+}