Use the object managers to check for initialized objects

Author: mbabker

phpstan-baseline.neon

@@ -540,12 +540,6 @@ parameters:
 			count: 1
 			path: src/Timestampable/Mapping/Driver/Yaml.php
 
-		-
-			message: '#^Access to an undefined property ProxyManager\\Proxy\\GhostObjectInterface&TObject of object\:\:\$identifier\.$#'
-			identifier: property.notFound
-			count: 1
-			path: src/Tool/Wrapper/MongoDocumentWrapper.php
-
 		-
 			message: '#^Call to function property_exists\(\) with \$this\(Gedmo\\Translatable\\Hydrator\\ORM\\ObjectHydrator\) and ''_em'' will always evaluate to false\.$#'
 			identifier: function.impossibleType

src/Tool/Wrapper/EntityWrapper.php

@@ -11,7 +11,6 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\Persistence\Proxy as PersistenceProxy;
 use Gedmo\Tool\ClassUtils;
 
 /**
@@ -35,11 +34,6 @@ class EntityWrapper extends AbstractWrapper
      */
     private $identifier;
 
-    /**
-     * True if entity or proxy is loaded
-     */
-    private bool $initialized = false;
-
     /**
      * Wrap entity
      *
@@ -124,12 +118,8 @@ public function isEmbeddedAssociation($field)
      */
     protected function initialize()
     {
-        if (!$this->initialized) {
-            if ($this->object instanceof PersistenceProxy) {
-                if (!$this->object->__isInitialized()) {
-                    $this->object->__load();
-                }
-            }
+        if ($this->om->isUninitializedObject($this->object)) {
+            $this->om->initializeObject($this->object);
         }
     }
 }

src/Tool/Wrapper/MongoDocumentWrapper.php

@@ -32,11 +32,6 @@ class MongoDocumentWrapper extends AbstractWrapper
      */
     private ?string $identifier = null;
 
-    /**
-     * True if document or proxy is loaded
-     */
-    private bool $initialized = false;
-
     /**
      * Wrap document
      *
@@ -111,24 +106,15 @@ public function isEmbeddedAssociation($field)
      */
     protected function initialize()
     {
-        if (!$this->initialized) {
-            if ($this->object instanceof GhostObjectInterface) {
-                $uow = $this->om->getUnitOfWork();
-                if (!$this->object->isProxyInitialized()) {
-                    $persister = $uow->getDocumentPersister($this->meta->getName());
-                    $identifier = null;
-                    if ($uow->isInIdentityMap($this->object)) {
-                        $identifier = $this->getIdentifier();
-                    } else {
-                        // this may not happen but in case
-                        $getIdentifier = \Closure::bind(fn () => $this->identifier, $this->object, get_class($this->object));
-
-                        $identifier = $getIdentifier();
-                    }
-                    $this->object->initializeProxy();
-                    $persister->load($identifier, $this->object);
-                }
-            }
+        if (method_exists($this->om, 'isUninitializedObject') && $this->om->isUninitializedObject($this->object)) {
+            $this->om->initializeObject($this->object);
+
+            return;
+        }
+
+        // @todo: Drop support for this fallback when requiring `doctrine/mongodb-odm:^2.6 as a minimum`
+        if ($this->object instanceof GhostObjectInterface && !$this->object->isProxyInitialized()) {
+            $this->om->initializeObject($this->object);
         }
     }
 }