Merge pull request #266 from nextcloud/doctrine-dbal-3.0

Fix compatibility with doctrine/dbal 3.0

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 0.6.1 – 2021-01-08
+### Added
+ - Compatibility with Nextcloud 21 beta 5
+
 ## 0.6.0 – 2020-12-14
 ### Added
  - Allow forcing user name patterns and providing hints on the registration form and email (by @pxlfrk )

appinfo/info.xml

@@ -23,7 +23,7 @@ This app allows users to register a new account.
 4. User is lead to a form where they can choose their username and password
 5. New account is created and is logged in automatically
 		]]></description>
-	<version>0.6.0</version>
+	<version>0.6.1</version>
 	<licence>agpl</licence>
 	<author mail="pellaeon@cnmc.tw" homepage="https://nyllep.wordpress.com/about-2">Pellaeon Lin</author>
 	<types>

lib/Migration/Version0005Date20200710135953.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace OCA\Registration\Migration;
 
 use Closure;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -43,34 +43,34 @@ class Version0005Date20200710135953 extends SimpleMigrationStep {
 
 		if (!$schema->hasTable('registration')) {
 			$table = $schema->createTable('registration');
-			$table->addColumn('id', Type::INTEGER, [
+			$table->addColumn('id', Types::INTEGER, [
 				'autoincrement' => true,
 				'notnull' => true,
 				'unsigned' => true,
 			]);
-			$table->addColumn('email', Type::STRING, [
+			$table->addColumn('email', Types::STRING, [
 				'notnull' => true,
 			]);
-			$table->addColumn('username', Type::STRING, [
+			$table->addColumn('username', Types::STRING, [
 				'notnull' => false,
 			]);
-			$table->addColumn('password', Type::STRING, [
+			$table->addColumn('password', Types::STRING, [
 				'notnull' => false,
 			]);
-			$table->addColumn('displayname', Type::STRING, [
+			$table->addColumn('displayname', Types::STRING, [
 				'notnull' => false,
 			]);
-			$table->addColumn('email_confirmed', Type::BOOLEAN, [
+			$table->addColumn('email_confirmed', Types::BOOLEAN, [
 				'notnull' => false,
 				'default' => false,
 			]);
-			$table->addColumn('token', Type::STRING, [
+			$table->addColumn('token', Types::STRING, [
 				'notnull' => true,
 			]);
-			$table->addColumn('client_secret', Type::STRING, [
+			$table->addColumn('client_secret', Types::STRING, [
 				'notnull' => false,
 			]);
-			$table->addColumn('requested', Type::DATETIME, [
+			$table->addColumn('requested', Types::DATETIME_MUTABLE, [
 				'notnull' => true,
 			]);
 			$table->setPrimaryKey(['id']);

tests/Unit/Service/RegistrationServiceTest.php

@@ -270,8 +270,6 @@ class RegistrationServiceTest extends TestCase {
 	 * @depends testDuplicateUsernameApi
 	 */
 	public function testUsernameDoesntMatchPattern() {
-
-
 		$this->config->expects($this->atLeastOnce())
 			->method('getAppValue')
 			->willReturnMap([