From 6fdf3301e1f7507fbbf1a1150ebc610fc7e01414 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 8 Jan 2021 12:51:52 +0100
Subject: [PATCH 1/2] Fix compatibility with doctrine/dbal 3.0

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../Version0005Date20200710135953.php         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/Migration/Version0005Date20200710135953.php b/lib/Migration/Version0005Date20200710135953.php
index 278baae..2e8ed78 100644
--- a/lib/Migration/Version0005Date20200710135953.php
+++ b/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']);

From 6374080d7864157c43a3a5ebc60c34a95406fc7b Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 8 Jan 2021 12:55:53 +0100
Subject: [PATCH 2/2] Bump version so we can release it

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 CHANGELOG.md                                   | 4 ++++
 appinfo/info.xml                               | 2 +-
 tests/Unit/Service/RegistrationServiceTest.php | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50228ee..ab1818a 100644
--- a/CHANGELOG.md
+++ b/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 )
diff --git a/appinfo/info.xml b/appinfo/info.xml
index c1db782..55d3b0a 100644
--- a/appinfo/info.xml
+++ b/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>
diff --git a/tests/Unit/Service/RegistrationServiceTest.php b/tests/Unit/Service/RegistrationServiceTest.php
index 7a819cc..31c4d51 100644
--- a/tests/Unit/Service/RegistrationServiceTest.php
+++ b/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([