Merge pull request #12046 from greg0ire/3.5.x

greg0ire · web-flow · commit 6deec3655ba3 · 2025-07-01T19:40:53.000+02:00
Merge 3.4.x up into 3.5.x
diff --git a/src/Configuration.php b/src/Configuration.php
@@ -667,15 +667,15 @@ public function isNativeLazyObjectsEnabled(): bool
 
     public function enableNativeLazyObjects(bool $nativeLazyObjects): void
     {
-        if (! $nativeLazyObjects) {
+        if (PHP_VERSION_ID >= 80400 && ! $nativeLazyObjects) {
             Deprecation::trigger(
                 'doctrine/orm',
                 'https://github.com/doctrine/orm/pull/12005',
                 'Disabling native lazy objects is deprecated and will be impossible in Doctrine ORM 4.0.',
             );
         }
 
-        if (PHP_VERSION_ID < 80400) {
+        if (PHP_VERSION_ID < 80400 && $nativeLazyObjects) {
             throw new LogicException('Lazy loading proxies require PHP 8.4 or higher.');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -667,15 +667,15 @@ public function isNativeLazyObjectsEnabled(): bool`
`667`	`667`
`668`	`668`	`public function enableNativeLazyObjects(bool $nativeLazyObjects): void`
`669`	`669`	`{`
`670`		`- if (! $nativeLazyObjects) {`
	`670`	`+ if (PHP_VERSION_ID >= 80400 && ! $nativeLazyObjects) {`
`671`	`671`	`Deprecation::trigger(`
`672`	`672`	`'doctrine/orm',`
`673`	`673`	`'https://github.com/doctrine/orm/pull/12005',`
`674`	`674`	`'Disabling native lazy objects is deprecated and will be impossible in Doctrine ORM 4.0.',`
`675`	`675`	`);`
`676`	`676`	`}`
`677`	`677`
`678`		`- if (PHP_VERSION_ID < 80400) {`
	`678`	`+ if (PHP_VERSION_ID < 80400 && $nativeLazyObjects) {`
`679`	`679`	`throw new LogicException('Lazy loading proxies require PHP 8.4 or higher.');`
`680`	`680`	`}`
`681`	`681`