Merge branch '4.4.x' into 5.0.x

Author: morozov

UPGRADE.md

@@ -356,6 +356,13 @@ all drivers and middleware.
 
 # Upgrade to 4.4
 
+## Deprecated `AbstractAsset::getName()`
+
+The `AbstractAsset::getName()` method has been deprecated. Instead, use `NamedObject::getObjectName()` or 
+`OptionallyQualifiedName::getObjectName()` to get the object representation of the name. SQL context, convert the
+resulting `Name` to SQL using `Name::toSQL()`. In other contexts, convert the resulting name to string using
+`Name::toString()`.
+
 ## Deprecated `AbstractAsset::isQuoted()`
 
 The `AbstractAsset::isQuoted()` method has been deprecated. The recommended approach depends on the object class:
@@ -674,7 +681,7 @@ The `Table::__construct()` method has been marked as internal. Use `Table::edito
 
 ## Deprecated `AbstractAsset::getShortestName()`
 
-The `AbstractAsset::getShortestName()` method has been deprecated. Use `AbstractAsset::getName()` instead.
+The `AbstractAsset::getShortestName()` method has been deprecated. Use `NamedObject::getObjectName()` instead.
 
 ## Deprecated `Sequence::isAutoIncrementsFor()`
 

composer.json

@@ -37,10 +37,10 @@
         "psr/log": "^1|^2|^3"
     },
     "require-dev": {
-        "doctrine/coding-standard": "13.0.0",
+        "doctrine/coding-standard": "13.0.1",
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "2023.2",
-        "phpstan/phpstan": "2.1.17",
+        "phpstan/phpstan": "2.1.22",
         "phpstan/phpstan-phpunit": "2.0.6",
         "phpstan/phpstan-strict-rules": "^2",
         "phpunit/phpunit": "12.3.0",

docs/en/reference/schema-manager.rst

@@ -59,7 +59,7 @@ Now you can loop over the array inspecting each sequence object:
 
     <?php
     foreach ($sequences as $sequence) {
-        echo $sequence->getName() . "\n";
+        echo $sequence->getObjectName()->toString() . PHP_EOL;
     }
 
 listTableColumns()
@@ -79,7 +79,7 @@ Now you can loop over the array inspecting each column object:
 
     <?php
     foreach ($columns as $column) {
-        echo $column->getName() . ': ' . $column->getType() . "\n";
+        echo $column->getObjectName()->toString() . ': ' . $column->getType() . PHP_EOL;
     }
 
 introspectTable()
@@ -119,7 +119,7 @@ object:
 
     <?php
     foreach ($foreignKeys as $foreignKey) {
-        echo $foreignKey->getName() ."\n";
+        echo $foreignKey->getObjectName()->toString() . PHP_EOL;
     }
 
 listTableIndexes()
@@ -139,7 +139,12 @@ Now you can loop over the array inspecting each index object:
 
     <?php
     foreach ($indexes as $index) {
-        echo $index->getName() . ': ' . ($index->isUnique() ? 'unique' : 'not unique') . "\n";
+        echo $index->getObjectName()->toString() . ': ' . match($index->getType()) {
+            IndexType::REGULAR  => 'regular',
+            IndexType::UNIQUE   => 'unique',
+            IndexType::FULLTEXT => 'fulltext',
+            IndexType::SPATIAL  => 'spatial',
+        } . PHP_EOL;
     }
 
 listTables()
@@ -162,9 +167,9 @@ retrieved with the ``getColumns()`` method:
 
     <?php
     foreach ($tables as $table) {
-        echo $table->getName() . " columns:\n\n";
+        echo $table->getObjectName()->toString() . " columns:" . PHP_EOL;
         foreach ($table->getColumns() as $column) {
-            echo ' - ' . $column->getName() . "\n";
+            echo ' - ' . $column->getObjectName()->toString() . PHP_EOL;
         }
     }
 
@@ -185,7 +190,7 @@ Now you can loop over the array inspecting each view object:
 
     <?php
     foreach ($views as $view) {
-        echo $view->getName() . ': ' . $view->getSql() . "\n";
+        echo $view->getObjectName()->toString() . ': ' . $view->getSql() . PHP_EOL;
     }
 
 introspectSchema()

src/Schema/AbstractAsset.php

@@ -116,6 +116,10 @@ protected function trimQuotes(string $identifier): string
 
     /**
      * Returns the name of this schema asset.
+     *
+     * @deprecated Use {@see NamedObject::getObjectName()} or {@see OptionallyQualifiedName::getObjectName()} instead.
+     *             In SQL context, convert the resulting {@see Name} to SQL using {@see Name::toSQL()}. In other
+     *             contexts, convert the resulting name to string using {@see Name::toString()}.
      */
     public function getName(): string
     {

src/Schema/AbstractSchemaManager.php

@@ -111,7 +111,7 @@ public function listSchemaNames(): array
     /**
      * Lists the available sequences for this connection.
      *
-     * @return array<int, Sequence>
+     * @return list<Sequence>
      *
      * @throws Exception
      */
@@ -209,7 +209,7 @@ public function tableExists(string $tableName): bool
     /**
      * Returns a list of all tables in the current database.
      *
-     * @return array<int, non-empty-string>
+     * @return list<non-empty-string>
      *
      * @throws Exception
      */
@@ -218,6 +218,7 @@ public function listTableNames(): array
         $supportsSchemas   = $this->platform->supportsSchemas();
         $currentSchemaName = $this->getCurrentSchemaName();
 
+        /** @phpstan-ignore return.type */
         return $this->filterAssetNames(
             array_map(static function (array $row) use ($supportsSchemas, $currentSchemaName): string {
                 $name = $row[self::TABLE_NAME_COLUMN];
@@ -237,9 +238,11 @@ public function listTableNames(): array
      * Filters asset names if they are configured to return only a subset of all
      * the found elements.
      *
-     * @param array<int, mixed> $assetNames
+     * @param list<N> $assetNames
      *
-     * @return array<int, mixed>
+     * @return list<N>
+     *
+     * @template N
      */
     private function filterAssetNames(array $assetNames): array
     {

src/Schema/Table.php

@@ -302,7 +302,7 @@ final public function renameColumn(string $oldName, string $newName): Column
         if ($oldName === $newName) {
             throw new LogicException(sprintf(
                 'Attempt to rename column "%s.%s" to the same name.',
-                $this->getName(),
+                $this->name->toString(),
                 $oldName,
             ));
         }
@@ -609,10 +609,11 @@ public function dropUniqueConstraint(string $name): void
     /**
      * Returns the list of table columns.
      *
-     * @return list<Column>
+     * @return non-empty-list<Column>
      */
     public function getColumns(): array
     {
+        /** @phpstan-ignore return.type */
         return array_values($this->_columns);
     }
 

tests/Functional/Driver/DBAL6024Test.php

@@ -54,7 +54,7 @@ public function testDropPrimaryKey(): void
         $schemaManager->alterTable($diff);
 
         $validationSchema = $schemaManager->introspectSchema();
-        $validationTable  = $validationSchema->getTable($table->getName());
+        $validationTable  = $validationSchema->getTable($table->getObjectName()->toString());
 
         self::assertNull($validationTable->getPrimaryKeyConstraint());
     }

tests/Functional/Driver/DBAL6044Test.php

@@ -53,19 +53,19 @@ public function testUnloggedTables(): void
         $schemaManager = $this->connection->createSchemaManager();
 
         $validationSchema        = $schemaManager->introspectSchema();
-        $validationUnloggedTable = $validationSchema->getTable($unloggedTable->getName());
+        $validationUnloggedTable = $validationSchema->getTable($unloggedTable->getObjectName()->toString());
         self::assertTrue($validationUnloggedTable->getOption('unlogged'));
-        $validationLoggedTable = $validationSchema->getTable($loggedTable->getName());
+        $validationLoggedTable = $validationSchema->getTable($loggedTable->getObjectName()->toString());
         self::assertFalse($validationLoggedTable->getOption('unlogged'));
 
         $sql  = 'SELECT relpersistence FROM pg_class WHERE relname = ?';
         $stmt = $this->connection->prepare($sql);
 
-        $stmt->bindValue(1, $unloggedTable->getName());
+        $stmt->bindValue(1, $unloggedTable->getObjectName()->toString());
         $unloggedTablePersistenceType = $stmt->executeQuery()->fetchOne();
         self::assertEquals('u', $unloggedTablePersistenceType);
 
-        $stmt->bindValue(1, $loggedTable->getName());
+        $stmt->bindValue(1, $loggedTable->getObjectName()->toString());
         $loggedTablePersistenceType = $stmt->executeQuery()->fetchOne();
         self::assertEquals('p', $loggedTablePersistenceType);
     }

tests/Functional/Platform/AlterColumnTest.php

@@ -7,10 +7,13 @@
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\ColumnEditor;
+use Doctrine\DBAL\Schema\Name\UnqualifiedName;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Types\Types;
 
+use function array_map;
+
 class AlterColumnTest extends FunctionalTestCase
 {
     public function testColumnPositionRetainedAfterAltering(): void
@@ -45,12 +48,15 @@ public function testColumnPositionRetainedAfterAltering(): void
 
         $sm->alterTable($diff);
 
-        $table   = $sm->introspectTable('test_alter');
-        $columns = $table->getColumns();
+        $table = $sm->introspectTable('test_alter');
 
-        self::assertCount(2, $columns);
-        self::assertEqualsIgnoringCase('c1', $columns[0]->getName());
-        self::assertEqualsIgnoringCase('c2', $columns[1]->getName());
+        $this->assertUnqualifiedNameListEquals([
+            UnqualifiedName::unquoted('c1'),
+            UnqualifiedName::unquoted('c2'),
+        ], array_map(
+            static fn (Column $column): UnqualifiedName => $column->getObjectName(),
+            $table->getColumns(),
+        ));
     }
 
     public function testSupportsCollations(): void

tests/Functional/Platform/RenameColumnTest.php

@@ -5,13 +5,16 @@
 namespace Doctrine\DBAL\Tests\Functional\Platform;
 
 use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Schema\Name\UnqualifiedName;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
 use PHPUnit\Framework\Attributes\DataProvider;
 
+use function array_map;
+
 class RenameColumnTest extends FunctionalTestCase
 {
     /**
@@ -55,12 +58,16 @@ public function testColumnPositionRetainedAfterImplicitRenaming(string $oldColum
 
         $sm->alterTable($diff);
 
-        $table   = $sm->introspectTable('test_rename');
-        $columns = $table->getColumns();
+        $table = $sm->introspectTable('test_rename');
+
+        $this->assertUnqualifiedNameListEquals([
+            UnqualifiedName::unquoted($newColumnName),
+            UnqualifiedName::unquoted('c2'),
+        ], array_map(
+            static fn (Column $column): UnqualifiedName => $column->getObjectName(),
+            $table->getColumns(),
+        ));
 
-        self::assertCount(2, $columns);
-        self::assertEqualsIgnoringCase($newColumnName, $columns[0]->getName());
-        self::assertEqualsIgnoringCase('c2', $columns[1]->getName());
         self::assertCount(1, self::getRenamedColumns($diff));
         self::assertCount(1, $diff->getRenamedColumns());
     }
@@ -74,7 +81,10 @@ public static function getRenamedColumns(TableDiff $tableDiff): array
                 continue;
             }
 
-            $oldColumnName           = $diff->getOldColumn()->getName();
+            $oldColumnName = $diff->getOldColumn()
+                ->getObjectName()
+                ->toString();
+
             $renamed[$oldColumnName] = $diff->getNewColumn();
         }
 
@@ -116,22 +126,26 @@ public function testColumnPositionRetainedAfterExplicitRenaming(string $oldColum
 
         $sm->alterTable($diff);
 
-        $table   = $sm->introspectTable('test_rename');
-        $columns = $table->getColumns();
+        $table = $sm->introspectTable('test_rename');
 
         self::assertCount(1, $diff->getChangedColumns());
         self::assertCount(1, $diff->getRenamedColumns());
         self::assertCount(1, $diff->getModifiedColumns());
-        self::assertCount(2, $columns);
-        self::assertEqualsIgnoringCase($newColumnName, $columns[0]->getName());
-        self::assertEqualsIgnoringCase('c2', $columns[1]->getName());
+
+        $this->assertUnqualifiedNameListEquals([
+            UnqualifiedName::unquoted($newColumnName),
+            UnqualifiedName::unquoted('c2'),
+        ], array_map(
+            static fn (Column $column): UnqualifiedName => $column->getObjectName(),
+            $table->getColumns(),
+        ));
     }
 
     /** @return iterable<array{non-empty-string,non-empty-string}> */
     public static function columnNameProvider(): iterable
     {
         yield ['c1', 'c1_x'];
         yield ['C1', 'c1_x'];
-        yield ['importantColumn', 'veryImportantColumn'];
+        yield ['importantColumn', 'very_important_column'];
     }
 }