Merge pull request #1313 from nextcloud/fix/dbal-typesv21.0.0beta6

Fix dbal types

3 files changed, 27 insertions, 27 deletions

diff --git a/lib/Migration/Version010000Date20190617184535.php b/lib/Migration/Version010000Date20190617184535.php
index e6f38c65c..d71bc9d0e 100644
--- a/lib/Migration/Version010000Date20190617184535.php
+++ b/lib/Migration/Version010000Date20190617184535.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace OCA\Text\Migration;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
@@ -35,32 +35,32 @@ class Version010000Date20190617184535 extends SimpleMigrationStep {
 
 		if (!$schema->hasTable('text_documents')) {
 			$table = $schema->createTable('text_documents');
-			$table->addColumn('id', Type::BIGINT, [
+			$table->addColumn('id', Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'unsigned' => true,
 			]);
-			$table->addColumn('current_version', Type::BIGINT, [
+			$table->addColumn('current_version', Types::BIGINT, [
 				'notnull' => true,
 				'default' => 0,
 				'unsigned' => true,
 			]);
-			$table->addColumn('last_saved_version', Type::BIGINT, [
+			$table->addColumn('last_saved_version', Types::BIGINT, [
 				'notnull' => true,
 				'default' => 0,
 				'unsigned' => true,
 			]);
-			$table->addColumn('last_saved_version_time', Type::BIGINT, [
+			$table->addColumn('last_saved_version_time', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 20,
 				'unsigned' => true,
 			]);
-			$table->addColumn('last_saved_version_etag', Type::STRING, [
+			$table->addColumn('last_saved_version_etag', Types::STRING, [
 				'notnull' => false,
 				'length' => 64,
 				'default' => ''
 			]);
-			$table->addColumn('base_version_etag', TYPE::STRING, [
+			$table->addColumn('base_version_etag', Types::STRING, [
 				'notnull' => false,
 				'length' => 64,
 				'default' => ''
@@ -70,31 +70,31 @@ class Version010000Date20190617184535 extends SimpleMigrationStep {
 
 		if (!$schema->hasTable('text_sessions')) {
 			$table = $schema->createTable('text_sessions');
-			$table->addColumn('id', Type::BIGINT, [
+			$table->addColumn('id', Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'unsigned' => true,
 			]);
-			$table->addColumn('user_id', Type::STRING, [
+			$table->addColumn('user_id', Types::STRING, [
 				'notnull' => false,
 				'length' => 64,
 			]);
-			$table->addColumn('guest_name', Type::STRING, [
+			$table->addColumn('guest_name', Types::STRING, [
 				'notnull' => false,
 				'length' => 64,
 			]);
-			$table->addColumn('color', Type::STRING, [
+			$table->addColumn('color', Types::STRING, [
 				'notnull' => false,
 				'length' => 7,
 			]);
-			$table->addColumn('token', Type::STRING, [
+			$table->addColumn('token', Types::STRING, [
 				'notnull' => true,
 				'length' => 64,
 			]);
-			$table->addColumn('document_id', Type::BIGINT, [
+			$table->addColumn('document_id', Types::BIGINT, [
 				'notnull' => true,
 			]);
-			$table->addColumn('last_contact', Type::BIGINT, [
+			$table->addColumn('last_contact', Types::BIGINT, [
 				'notnull' => true,
 				'length' => 20,
 				'unsigned' => true,
@@ -105,23 +105,23 @@ class Version010000Date20190617184535 extends SimpleMigrationStep {
 
 		if (!$schema->hasTable('text_steps')) {
 			$table = $schema->createTable('text_steps');
-			$table->addColumn('id', Type::BIGINT, [
+			$table->addColumn('id', Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'unsigned' => true,
 			]);
-			$table->addColumn('document_id', Type::BIGINT, [
+			$table->addColumn('document_id', Types::BIGINT, [
 				'notnull' => true,
 				'unsigned' => true,
 			]);
-			$table->addColumn('session_id', Type::BIGINT, [
+			$table->addColumn('session_id', Types::BIGINT, [
 				'notnull' => true,
 				'unsigned' => true,
 			]);
-			$table->addColumn('data', Type::TEXT, [
+			$table->addColumn('data', Types::TEXT, [
 				'notnull' => true,
 			]);
-			$table->addColumn('version', Type::BIGINT, [
+			$table->addColumn('version', Types::BIGINT, [
 				'notnull' => true,
 				'default' => 0,
 				'unsigned' => true,
diff --git a/lib/Migration/Version030201Date20201116123153.php b/lib/Migration/Version030201Date20201116123153.php
index abacaa6fa..7c23c5511 100644
--- a/lib/Migration/Version030201Date20201116123153.php
+++ b/lib/Migration/Version030201Date20201116123153.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace OCA\Text\Migration;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\IConfig;
 use OCP\Migration\IOutput;
@@ -31,32 +31,32 @@ class Version030201Date20201116123153 extends SimpleMigrationStep {
 		if (!$schema->hasTable('text_documents')) {
 			// Recreate table from the first migration since we cannot alter the autoincrement on the id column with oracle
 			$table = $schema->createTable('text_documents');
-			$table->addColumn('id', Type::BIGINT, [
+			$table->addColumn('id', Types::BIGINT, [
 				'notnull' => true,
 				'unsigned' => true,
 			]);
-			$table->addColumn('current_version', Type::BIGINT, [
+			$table->addColumn('current_version', Types::BIGINT, [
 				// 'notnull' => true,
 				'notnull' => false,
 				'default' => 0,
 				'unsigned' => true,
 			]);
-			$table->addColumn('last_saved_version', Type::BIGINT, [
+			$table->addColumn('last_saved_version', Types::BIGINT, [
 				// 'notnull' => true,
 				'notnull' => false,
 				'default' => 0,
 				'unsigned' => true,
 			]);
-			$table->addColumn('last_saved_version_time', Type::BIGINT, [
+			$table->addColumn('last_saved_version_time', Types::BIGINT, [
 				'length' => 20,
 				'unsigned' => true,
 			]);
-			$table->addColumn('last_saved_version_etag', Type::STRING, [
+			$table->addColumn('last_saved_version_etag', Types::STRING, [
 				'notnull' => false,
 				'length' => 64,
 				'default' => ''
 			]);
-			$table->addColumn('base_version_etag', Type::STRING, [
+			$table->addColumn('base_version_etag', Types::STRING, [
 				'notnull' => false,
 				'length' => 64,
 				'default' => ''
diff --git a/psalm.xml b/psalm.xml
index 77f994945..dbfd50a20 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -16,7 +16,7 @@
 		<UndefinedClass>
 			<errorLevel type="suppress">
 				<referencedClass name="OC" />
-				<referencedClass name="Doctrine\DBAL\Types\Type"/>
+				<referencedClass name="Doctrine\DBAL\Types\Types"/>
 			</errorLevel>
 		</UndefinedClass>
 		<UndefinedDocblockClass>