Merge branch '3.5.x' into 3.6.x

* 3.5.x:
  Move LazyGhost deprecation to ProxyFactory (#12101)
  Address deprecations from doctrine/dbal (#12098)

Author: derrabus

src/Configuration.php

@@ -652,17 +652,7 @@ public function setSchemaIgnoreClasses(array $schemaIgnoreClasses): void
 
     public function isNativeLazyObjectsEnabled(): bool
     {
-        $nativeLazyObjects = $this->attributes['nativeLazyObjects'] ?? false;
-
-        if (! $nativeLazyObjects && PHP_VERSION_ID >= 80400) {
-            Deprecation::trigger(
-                'doctrine/orm',
-                'https://github.com/doctrine/orm/pull/12005',
-                'Not enabling native lazy objects is deprecated and will be impossible in Doctrine ORM 4.0.',
-            );
-        }
-
-        return $nativeLazyObjects;
+        return $this->attributes['nativeLazyObjects'] ?? false;
     }
 
     public function enableNativeLazyObjects(bool $nativeLazyObjects): void

src/Proxy/ProxyFactory.php

@@ -152,7 +152,23 @@ public function __construct(
         string|null $proxyNs = null,
         bool|int $autoGenerate = self::AUTOGENERATE_NEVER,
     ) {
-        if (PHP_VERSION_ID >= 80400 && func_num_args() > 1) {
+        if (! $em->getConfiguration()->isNativeLazyObjectsEnabled()) {
+            if (PHP_VERSION_ID >= 80400) {
+                Deprecation::trigger(
+                    'doctrine/orm',
+                    'https://github.com/doctrine/orm/pull/12005',
+                    'Not enabling native lazy objects is deprecated and will be impossible in Doctrine ORM 4.0.',
+                );
+            }
+
+            if (! $proxyDir) {
+                throw ORMInvalidArgumentException::proxyDirectoryRequired();
+            }
+
+            if (! $proxyNs) {
+                throw ORMInvalidArgumentException::proxyNamespaceRequired();
+            }
+        } elseif (PHP_VERSION_ID >= 80400 && func_num_args() > 1) {
             Deprecation::trigger(
                 'doctrine/orm',
                 'https://github.com/doctrine/orm/pull/12005',
@@ -161,14 +177,6 @@ public function __construct(
             );
         }
 
-        if (! $proxyDir && ! $em->getConfiguration()->isNativeLazyObjectsEnabled()) {
-            throw ORMInvalidArgumentException::proxyDirectoryRequired();
-        }
-
-        if (! $proxyNs && ! $em->getConfiguration()->isNativeLazyObjectsEnabled()) {
-            throw ORMInvalidArgumentException::proxyNamespaceRequired();
-        }
-
         if (is_int($autoGenerate) ? $autoGenerate < 0 || $autoGenerate > 4 : ! is_bool($autoGenerate)) {
             throw ORMInvalidArgumentException::invalidAutoGenerateMode($autoGenerate);
         }

tests/Tests/ORM/ConfigurationTest.php

@@ -229,19 +229,4 @@ public function testDisablingNativeLazyObjectsIsDeprecated(): void
 
         $this->configuration->enableNativeLazyObjects(false);
     }
-
-    #[RequiresPhp('<8.4')]
-    public function testNotEnablingNativeLazyObjectIsFineOnPhpLowerThan84(): void
-    {
-        $this->expectNoDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/12005');
-        self::assertFalse($this->configuration->isNativeLazyObjectsEnabled());
-    }
-
-    #[RequiresPhp('8.4')]
-    #[WithoutErrorHandler]
-    public function testNotEnablingNativeLazyObjectIsDeprecatedOnPhp84(): void
-    {
-        $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/12005');
-        self::assertFalse($this->configuration->isNativeLazyObjectsEnabled());
-    }
 }

tests/Tests/ORM/Functional/Ticket/GH11982Test.php

@@ -5,10 +5,12 @@
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
+use Doctrine\DBAL\Schema\Index;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Tests\OrmFunctionalTestCase;
 use PHPUnit\Framework\Attributes\Group;
 
+use function method_exists;
 use function reset;
 
 class GH11982Test extends OrmFunctionalTestCase
@@ -29,6 +31,38 @@ public function testSchema(): void
             self::markTestSkipped('This test does not work on psql.');
         }
 
+        if (! method_exists(Index::class, 'getIndexedColumns')) {
+            self::markTestSkipped('This test requires doctrine/dbal >=4.3');
+        }
+
+        $indexes = $this->createSchemaManager()
+            ->introspectTable('GH11982ColumnIndex')
+            ->getIndexes();
+
+        self::assertCount(3, $indexes); // primary + 2 custom indexes
+        self::assertArrayHasKey('class_idx', $indexes);
+
+        unset($indexes['primary']);
+        unset($indexes['class_idx']);
+        $unnamedIndexColumns = reset($indexes)->getIndexedColumns();
+        self::assertCount(1, $unnamedIndexColumns);
+        self::assertEquals(
+            'indexTrue',
+            $unnamedIndexColumns[0]->getColumnName()->toString(),
+        );
+    }
+
+    #[Group('GH-11982')]
+    public function testSchemaLegacyDbal(): void
+    {
+        if ($this->_em->getConnection()->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+            self::markTestSkipped('This test does not work on psql.');
+        }
+
+        if (method_exists(Index::class, 'getIndexedColumns')) {
+            self::markTestSkipped('This test requires doctrine/dbal <4.3');
+        }
+
         $indexes = $this->createSchemaManager()
             ->introspectTable('GH11982ColumnIndex')
             ->getIndexes();
@@ -48,7 +82,7 @@ public function testSchema(): void
 #[ORM\Index(
     name: 'class_idx',
     fields: ['classIndex'],
-    flags: ['test'],
+    flags: ['fulltext'],
     options: ['test'],
 )]
 class GH11982ColumnIndex

tests/Tests/ORM/Proxy/ProxyFactoryTest.php

@@ -7,6 +7,7 @@
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\ORM\EntityNotFoundException;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Persisters\Entity\BasicEntityPersister;
@@ -21,6 +22,7 @@
 use Doctrine\Tests\OrmTestCase;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\RequiresPhp;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use ReflectionClass;
 use ReflectionProperty;
 use stdClass;
@@ -34,10 +36,10 @@
  */
 class ProxyFactoryTest extends OrmTestCase
 {
-    private UnitOfWorkMock $uowMock;
+    use VerifyDeprecations;
 
+    private UnitOfWorkMock $uowMock;
     private EntityManagerMock $emMock;
-
     private ProxyFactory $proxyFactory;
 
     protected function setUp(): void
@@ -243,6 +245,37 @@ public function testProxyFactoryAcceptsNullProxyArgsWhenNativeLazyObjectsAreEnab
 
         self::assertTrue($reflection->isUninitializedLazyObject($proxy));
     }
+
+    #[RequiresPhp('8.4')]
+    #[WithoutErrorHandler]
+    public function testProxyFactoryTriggersDeprecationWhenNativeLazyObjectsAreDisabled(): void
+    {
+        $this->emMock->getConfiguration()->enableNativeLazyObjects(false);
+
+        $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/12005');
+
+        $this->proxyFactory = new ProxyFactory(
+            $this->emMock,
+            sys_get_temp_dir(),
+            'Proxies',
+            ProxyFactory::AUTOGENERATE_ALWAYS,
+        );
+    }
+
+    #[RequiresPhp('< 8.4')]
+    public function testProxyFactoryDoesNotTriggerDeprecationWhenNativeLazyObjectsAreDisabled(): void
+    {
+        $this->emMock->getConfiguration()->enableNativeLazyObjects(false);
+
+        $this->expectNoDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/12005');
+
+        $this->proxyFactory = new ProxyFactory(
+            $this->emMock,
+            sys_get_temp_dir(),
+            'Proxies',
+            ProxyFactory::AUTOGENERATE_ALWAYS,
+        );
+    }
 }
 
 abstract class AbstractClass