Use constants for DBAL types in tests

tests/Functional/AutoIncrementColumnTest.php

@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Platforms\SQLServer2012Platform;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Types\Types;
 
 class AutoIncrementColumnTest extends FunctionalTestCase
 {
@@ -13,7 +14,7 @@ class AutoIncrementColumnTest extends FunctionalTestCase
     protected function setUp(): void
     {
         $table = new Table('auto_increment_table');
-        $table->addColumn('id', 'integer', ['autoincrement' => true]);
+        $table->addColumn('id', Types::INTEGER, ['autoincrement' => true]);
         $table->setPrimaryKey(['id']);
 
         $this->dropAndCreateTable($table);

tests/Functional/BlobTest.php

@@ -7,6 +7,7 @@
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 
 use function fopen;
 use function str_repeat;
@@ -23,9 +24,9 @@ protected function setUp(): void
         }
 
         $table = new Table('blob_table');
-        $table->addColumn('id', 'integer');
-        $table->addColumn('clobcolumn', 'text', ['notnull' => false]);
-        $table->addColumn('blobcolumn', 'blob', ['notnull' => false]);
+        $table->addColumn('id', Types::INTEGER);
+        $table->addColumn('clobcolumn', Types::TEXT, ['notnull' => false]);
+        $table->addColumn('blobcolumn', Types::BLOB, ['notnull' => false]);
         $table->setPrimaryKey(['id']);
 
         $this->dropAndCreateTable($table);
@@ -173,7 +174,10 @@ private function assertBlobContains(string $text): void
     {
         [, $blobValue] = $this->fetchRow();
 
-        $blobValue = Type::getType('blob')->convertToPHPValue($blobValue, $this->connection->getDatabasePlatform());
+        $blobValue = Type::getType(Types::BLOB)->convertToPHPValue(
+            $blobValue,
+            $this->connection->getDatabasePlatform(),
+        );
 
         self::assertIsResource($blobValue);
         self::assertEquals($text, stream_get_contents($blobValue));

tests/Functional/ConnectionTest.php

@@ -433,7 +433,7 @@ public function testExceptionOnPrepareAndExecute(): void
     private function createTestTable(): void
     {
         $table = new Table(self::TABLE);
-        $table->addColumn('id', 'integer');
+        $table->addColumn('id', Types::INTEGER);
         $table->setPrimaryKey(['id']);
 
         $this->dropAndCreateTable($table);

tests/Functional/DataAccessTest.php

@@ -26,9 +26,9 @@ class DataAccessTest extends FunctionalTestCase
     protected function setUp(): void
     {
         $table = new Table('fetch_table');
-        $table->addColumn('test_int', 'integer');
-        $table->addColumn('test_string', 'string');
-        $table->addColumn('test_datetime', 'datetime', ['notnull' => false]);
+        $table->addColumn('test_int', Types::INTEGER);
+        $table->addColumn('test_string', Types::STRING);
+        $table->addColumn('test_datetime', Types::DATETIME_MUTABLE, ['notnull' => false]);
         $table->setPrimaryKey(['test_int']);
 
         $this->dropAndCreateTable($table);
@@ -438,8 +438,8 @@ public function testSqliteDateArithmeticWithDynamicInterval(): void
         }
 
         $table = new Table('fetch_table_date_math');
-        $table->addColumn('test_date', 'date');
-        $table->addColumn('test_days', 'integer');
+        $table->addColumn('test_date', Types::DATE_MUTABLE);
+        $table->addColumn('test_days', Types::INTEGER);
         $table->setPrimaryKey(['test_date']);
 
         $sm = $this->connection->getSchemaManager();

tests/Functional/Driver/OCI8/ConnectionTest.php

@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
+use Doctrine\DBAL\Types\Types;
 
 /** @requires extension oci8 */
 class ConnectionTest extends FunctionalTestCase
@@ -21,8 +22,8 @@ protected function setUp(): void
     public function testLastInsertIdAcceptsFqn(): void
     {
         $table = new Table('DBAL2595');
-        $table->addColumn('id', 'integer', ['autoincrement' => true]);
-        $table->addColumn('foo', 'integer');
+        $table->addColumn('id', Types::INTEGER, ['autoincrement' => true]);
+        $table->addColumn('foo', Types::INTEGER);
 
         $this->dropAndCreateTable($table);
 

tests/Functional/ExceptionTest.php

@@ -9,6 +9,7 @@
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
+use Doctrine\DBAL\Types\Types;
 use Throwable;
 
 use function array_merge;
@@ -32,7 +33,7 @@ class ExceptionTest extends FunctionalTestCase
     public function testPrimaryConstraintViolationException(): void
     {
         $table = new Table('duplicatekey_table');
-        $table->addColumn('id', 'integer', []);
+        $table->addColumn('id', Types::INTEGER, []);
         $table->setPrimaryKey(['id']);
         $this->dropAndCreateTable($table);
 
@@ -54,7 +55,7 @@ public function testTableExistsException(): void
     {
         $schemaManager = $this->connection->getSchemaManager();
         $table         = new Table('alreadyexist_table');
-        $table->addColumn('id', 'integer', []);
+        $table->addColumn('id', Types::INTEGER, []);
         $table->setPrimaryKey(['id']);
 
         $this->expectException(Exception\TableExistsException::class);
@@ -187,8 +188,8 @@ public function testForeignKeyConstraintViolationExceptionOnTruncate(): void
     public function testNotNullConstraintViolationException(): void
     {
         $table = new Table('notnull_table');
-        $table->addColumn('id', 'integer', []);
-        $table->addColumn('val', 'integer', ['notnull' => true]);
+        $table->addColumn('id', Types::INTEGER, []);
+        $table->addColumn('val', Types::INTEGER, ['notnull' => true]);
         $table->setPrimaryKey(['id']);
         $this->dropAndCreateTable($table);
 
@@ -199,7 +200,7 @@ public function testNotNullConstraintViolationException(): void
     public function testInvalidFieldNameException(): void
     {
         $table = new Table('bad_columnname_table');
-        $table->addColumn('id', 'integer', []);
+        $table->addColumn('id', Types::INTEGER, []);
         $this->dropAndCreateTable($table);
 
         // prevent the PHPUnit error handler from handling the warning that db2_bind_param() may trigger
@@ -212,11 +213,11 @@ public function testInvalidFieldNameException(): void
     public function testNonUniqueFieldNameException(): void
     {
         $table1 = new Table('ambiguous_list_table_1');
-        $table1->addColumn('id', 'integer');
+        $table1->addColumn('id', Types::INTEGER);
         $this->dropAndCreateTable($table1);
 
         $table2 = new Table('ambiguous_list_table_2');
-        $table2->addColumn('id', 'integer');
+        $table2->addColumn('id', Types::INTEGER);
         $this->dropAndCreateTable($table2);
 
         $sql = 'SELECT id FROM ambiguous_list_table_1, ambiguous_list_table_2';
@@ -227,7 +228,7 @@ public function testNonUniqueFieldNameException(): void
     public function testUniqueConstraintViolationException(): void
     {
         $table = new Table('unique_column_table');
-        $table->addColumn('id', 'integer');
+        $table->addColumn('id', Types::INTEGER);
         $table->addUniqueIndex(['id']);
 
         $this->dropAndCreateTable($table);
@@ -240,7 +241,7 @@ public function testUniqueConstraintViolationException(): void
     public function testSyntaxErrorException(): void
     {
         $table = new Table('syntax_error_table');
-        $table->addColumn('id', 'integer', []);
+        $table->addColumn('id', Types::INTEGER, []);
         $table->setPrimaryKey(['id']);
 
         $this->dropAndCreateTable($table);
@@ -280,7 +281,7 @@ public function testConnectionExceptionSqLite(): void
 
         $schema = new Schema();
         $table  = $schema->createTable('no_connection');
-        $table->addColumn('id', 'integer');
+        $table->addColumn('id', Types::INTEGER);
 
         $this->expectException(Exception\ReadOnlyException::class);
         $this->expectExceptionMessage(
@@ -354,12 +355,12 @@ private function setUpForeignKeyConstraintViolationExceptionTest(): void
         $schemaManager = $this->connection->getSchemaManager();
 
         $table = new Table('constraint_error_table');
-        $table->addColumn('id', 'integer', []);
+        $table->addColumn('id', Types::INTEGER, []);
         $table->setPrimaryKey(['id']);
 
         $owningTable = new Table('owning_table');
-        $owningTable->addColumn('id', 'integer', []);
-        $owningTable->addColumn('constraint_id', 'integer', []);
+        $owningTable->addColumn('id', Types::INTEGER, []);
+        $owningTable->addColumn('constraint_id', Types::INTEGER, []);
         $owningTable->setPrimaryKey(['id']);
         $owningTable->addForeignKeyConstraint($table, ['constraint_id'], ['id']);
 

tests/Functional/LegacyAPITest.php

@@ -5,6 +5,7 @@
 use Doctrine\DBAL\FetchMode;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use LogicException;
 
@@ -20,8 +21,8 @@ class LegacyAPITest extends FunctionalTestCase
     protected function setUp(): void
     {
         $table = new Table('legacy_table');
-        $table->addColumn('test_int', 'integer');
-        $table->addColumn('test_string', 'string');
+        $table->addColumn('test_int', Types::INTEGER);
+        $table->addColumn('test_string', Types::STRING);
         $table->setPrimaryKey(['test_int']);
 
         $this->dropAndCreateTable($table);

tests/Functional/LockMode/NoneTest.php

@@ -13,6 +13,7 @@
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
 use Doctrine\DBAL\TransactionIsolationLevel;
+use Doctrine\DBAL\Types\Types;
 
 class NoneTest extends FunctionalTestCase
 {
@@ -37,7 +38,7 @@ public function setUp(): void
         }
 
         $table = new Table('users');
-        $table->addColumn('id', 'integer');
+        $table->addColumn('id', Types::INTEGER);
         $table->setPrimaryKey(['id']);
 
         $this->dropAndCreateTable($table);

tests/Functional/ModifyLimitQueryTest.php

@@ -7,6 +7,7 @@
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Types\Types;
 
 use function array_change_key_case;
 use function count;
@@ -18,12 +19,12 @@ class ModifyLimitQueryTest extends FunctionalTestCase
     protected function setUp(): void
     {
         $table = new Table('modify_limit_table');
-        $table->addColumn('test_int', 'integer');
+        $table->addColumn('test_int', Types::INTEGER);
         $table->setPrimaryKey(['test_int']);
 
         $table2 = new Table('modify_limit_table2');
-        $table2->addColumn('id', 'integer', ['autoincrement' => true]);
-        $table2->addColumn('test_int', 'integer');
+        $table2->addColumn('id', Types::INTEGER, ['autoincrement' => true]);
+        $table2->addColumn('test_int', Types::INTEGER);
         $table2->setPrimaryKey(['id']);
 
         $this->dropAndCreateTable($table);

tests/Functional/NamedParametersTest.php

@@ -6,6 +6,7 @@
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Types\Types;
 use Throwable;
 
 use function array_change_key_case;
@@ -154,9 +155,9 @@ protected function setUp(): void
 
         try {
             $table = new Table('ddc1372_foobar');
-            $table->addColumn('id', 'integer');
-            $table->addColumn('foo', 'string');
-            $table->addColumn('bar', 'string');
+            $table->addColumn('id', Types::INTEGER);
+            $table->addColumn('foo', Types::STRING);
+            $table->addColumn('bar', Types::STRING);
             $table->setPrimaryKey(['id']);
 
             $sm = $this->connection->getSchemaManager();

tests/Functional/Platform/AlterColumnTest.php

@@ -15,8 +15,8 @@ class AlterColumnTest extends FunctionalTestCase
     public function testColumnPositionRetainedAfterAltering(): void
     {
         $table = new Table('test_alter');
-        $table->addColumn('c1', 'integer');
-        $table->addColumn('c2', 'integer');
+        $table->addColumn('c1', Types::INTEGER);
+        $table->addColumn('c2', Types::INTEGER);
 
         $this->dropAndCreateTable($table);
 

tests/Functional/Platform/DateExpressionTest.php

@@ -4,6 +4,7 @@
 
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Types\Types;
 
 use function sprintf;
 
@@ -13,8 +14,8 @@ class DateExpressionTest extends FunctionalTestCase
     public function testDifference(string $date1, string $date2, int $expected): void
     {
         $table = new Table('date_expr_test');
-        $table->addColumn('date1', 'datetime');
-        $table->addColumn('date2', 'datetime');
+        $table->addColumn('date1', Types::DATETIME_MUTABLE);
+        $table->addColumn('date2', Types::DATETIME_MUTABLE);
         $this->dropAndCreateTable($table);
         $this->connection->insert('date_expr_test', [
             'date1' => $date1,

tests/Functional/Platform/NewPrimaryKeyWithNewAutoIncrementColumnTest.php

@@ -7,6 +7,7 @@
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Types\Types;
 
 final class NewPrimaryKeyWithNewAutoIncrementColumnTest extends FunctionalTestCase
 {
@@ -39,14 +40,14 @@ public function testAlterPrimaryKeyToAutoIncrementColumn(callable $comparatorFac
         $schema        = $schemaManager->introspectSchema();
 
         $table = $schema->createTable('dbal2807');
-        $table->addColumn('initial_id', 'integer');
+        $table->addColumn('initial_id', Types::INTEGER);
         $table->setPrimaryKey(['initial_id']);
 
         $schemaManager->createTable($table);
 
         $newSchema = clone $schema;
         $newTable  = $newSchema->getTable($table->getName());
-        $newTable->addColumn('new_id', 'integer', ['autoincrement' => true]);
+        $newTable->addColumn('new_id', Types::INTEGER, ['autoincrement' => true]);
         $newTable->dropPrimaryKey();
         $newTable->setPrimaryKey(['new_id']);
 

tests/Functional/Platform/PlatformRestrictionsTest.php

@@ -4,6 +4,7 @@
 
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Types\Types;
 
 use function str_repeat;
 
@@ -23,7 +24,7 @@ public function testMaxIdentifierLengthLimitWithAutoIncrement(): void
         $tableName  = str_repeat('x', $platform->getMaxIdentifierLength());
         $columnName = str_repeat('y', $platform->getMaxIdentifierLength());
         $table      = new Table($tableName);
-        $table->addColumn($columnName, 'integer', ['autoincrement' => true]);
+        $table->addColumn($columnName, Types::INTEGER, ['autoincrement' => true]);
         $table->setPrimaryKey([$columnName]);
         $this->dropAndCreateTable($table);
         $createdTable = $this->connection->getSchemaManager()->introspectTable($tableName);

tests/Functional/Platform/RenameColumnTest.php

@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Schema\Comparator;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Types\Types;
 
 use function array_keys;
 use function strtolower;
@@ -15,13 +16,13 @@ class RenameColumnTest extends FunctionalTestCase
     public function testColumnPositionRetainedAfterRenaming(string $columnName, string $newColumnName): void
     {
         $table = new Table('test_rename');
-        $table->addColumn($columnName, 'string');
-        $table->addColumn('c2', 'integer');
+        $table->addColumn($columnName, Types::STRING);
+        $table->addColumn('c2', Types::INTEGER);
 
         $this->dropAndCreateTable($table);
 
         $table->dropColumn($columnName)
-            ->addColumn($newColumnName, 'string');
+            ->addColumn($newColumnName, Types::STRING);
 
         $sm         =  $this->connection->createSchemaManager();
         $comparator = new Comparator();