Only override initialiser if proxy object isn't initialised yet

doctrine · Oct 8, 2019 · f54d694 · f54d694
1 parent f86dbc6
commit f54d694
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php b/lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php
@@ -465,12 +465,18 @@ public function hydrate(object $document, array $data, array $hints = []) : arra
             }
         }
 
-        if ($document instanceof GhostObjectInterface) {
+        if ($document instanceof GhostObjectInterface && $document->getProxyInitializer() !== null) {
             // Inject an empty initialiser to not load any object data
-            $document->setProxyInitializer(static function () {
+            $document->setProxyInitializer(static function (
+                GhostObjectInterface $ghostObject,
+                string $method, // we don't care
+                array $parameters, // we don't care
+                &$initializer,
+                array $properties // we currently do not use this
+            ) : bool {
+                $initializer = null;
+                return true;
             });
-            $document->initializeProxy();
-            $document->setProxyInitializer(null);
         }
 
         $data = $this->getHydratorFor($metadata->name)->hydrate($document, $data, $hints);