Merge pull request #12044 from doctrine/3.4.x

greg0ire · web-flow · commit 80053336c9c8 · 2025-06-30T21:53:04.000+02:00
Merge branch 3.4.x into 3.5.x
diff --git a/src/Mapping/ClassMetadataFactory.php b/src/Mapping/ClassMetadataFactory.php
@@ -66,7 +66,9 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
 
     public function setEntityManager(EntityManagerInterface $em): void
     {
-        parent::setProxyClassNameResolver(new DefaultProxyClassNameResolver());
+        if (! $em->getConfiguration()->isNativeLazyObjectsEnabled()) {
+            parent::setProxyClassNameResolver(new DefaultProxyClassNameResolver());
+        }
 
         $this->em = $em;
     }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,9 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory`
`66`	`66`
`67`	`67`	`public function setEntityManager(EntityManagerInterface $em): void`
`68`	`68`	`{`
`69`		`- parent::setProxyClassNameResolver(new DefaultProxyClassNameResolver());`
	`69`	`+ if (! $em->getConfiguration()->isNativeLazyObjectsEnabled()) {`
	`70`	`+ parent::setProxyClassNameResolver(new DefaultProxyClassNameResolver());`
	`71`	`+ }`
`70`	`72`
`71`	`73`	`$this->em = $em;`
`72`	`74`	`}`