Merge pull request #11906 from xabbuh/dbal-6710

no longer use Table::columnsAreIndexed()

Author: greg0ire

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

@@ -42,8 +42,8 @@ public function testForeignKeyOnSTIWithMultipleMapping(): void
 
         $table = $schema->getTable('users_followed_objects');
         assert($table instanceof DbalTable);
-        self::assertTrue($table->columnsAreIndexed(['object_id']));
-        self::assertTrue($table->columnsAreIndexed(['user_id']));
+        self::assertTrue(self::columnIsIndexed($table, 'object_id'));
+        self::assertTrue(self::columnIsIndexed($table, 'user_id'));
         $foreignKeys = $table->getForeignKeys();
         self::assertCount(1, $foreignKeys, 'user_id column has to have FK, but not object_id');
 
@@ -55,6 +55,17 @@ public function testForeignKeyOnSTIWithMultipleMapping(): void
         self::assertContains('user_id', $localColumns);
         self::assertCount(1, $localColumns);
     }
+
+    private static function columnIsIndexed(DbalTable $table, string $column): bool
+    {
+        foreach ($table->getIndexes() as $index) {
+            if ($index->spansColumns([$column])) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
 
 

tests/Tests/ORM/Tools/SchemaToolTest.php

@@ -5,6 +5,7 @@
 namespace Doctrine\Tests\ORM\Tools;
 
 use Doctrine\Common\Collections\Collection;
+use Doctrine\DBAL\Schema\Table as DbalTable;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
@@ -65,7 +66,7 @@ public function testAddUniqueIndexForUniqueFieldAttribute(): void
         $schema = $schemaTool->getSchemaFromMetadata($classes);
 
         self::assertTrue($schema->hasTable('cms_users'), 'Table cms_users should exist.');
-        self::assertTrue($schema->getTable('cms_users')->columnsAreIndexed(['username']), 'username column should be indexed.');
+        self::assertTrue(self::columnIsIndexed($schema->getTable('cms_users'), 'username'), 'username column should be indexed.');
     }
 
     public function testAttributeOptionsArgument(): void
@@ -391,6 +392,17 @@ public function testLoadUniqueConstraintWithoutName(): void
         self::assertTrue($tableIndex->isUnique());
         self::assertSame(['field', 'anotherField'], $tableIndex->getColumns());
     }
+
+    private static function columnIsIndexed(DbalTable $table, string $column): bool
+    {
+        foreach ($table->getIndexes() as $index) {
+            if ($index->spansColumns([$column])) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
 
 #[Table(options: ['foo' => 'bar', 'baz' => ['key' => 'val']])]