From ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 30 Dec 2018 11:36:08 +0100
Subject: [ticket/14948] Adjust calls for twig and phpunit updates

PHPBB3-14948
---
 tests/functions/user_delete_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/functions/user_delete_test.php')

diff --git a/tests/functions/user_delete_test.php b/tests/functions/user_delete_test.php
index f419c90e9e..89aecdefb9 100644
--- a/tests/functions/user_delete_test.php
+++ b/tests/functions/user_delete_test.php
@@ -23,7 +23,7 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_delete.xml');
 	}
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
-- 
cgit v1.2.1


From 0b39e4e854da85ea6fd59578e1623078012fcae2 Mon Sep 17 00:00:00 2001
From: mrgoldy <gijsmartens1@gmail.com>
Date: Sun, 5 May 2019 18:26:43 +0200
Subject: [ticket/16008] Clean up phpBB OAuth system

PHPBB3-16008
---
 tests/functions/user_delete_test.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'tests/functions/user_delete_test.php')

diff --git a/tests/functions/user_delete_test.php b/tests/functions/user_delete_test.php
index 89aecdefb9..83fda05542 100644
--- a/tests/functions/user_delete_test.php
+++ b/tests/functions/user_delete_test.php
@@ -61,20 +61,21 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case
 		$passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers));
 
 		$oauth_provider = new \phpbb\auth\provider\oauth\oauth(
-			$db,
 			$config,
+			$phpbb_container,
+			$db,
+			$phpbb_dispatcher,
+			$lang,
 			$passwords_manager,
 			$request,
+			$oauth_provider_collection,
 			$user,
 			'phpbb_oauth_tokens',
 			'phpbb_oauth_states',
 			'phpbb_oauth_accounts',
-			$oauth_provider_collection,
 			'phpbb_users',
-			$phpbb_container,
-			$phpbb_dispatcher,
-			$this->phpbb_root_path,
-			$this->php_ext
+			$phpbb_root_path,
+			$phpEx
 		);
 		$provider_collection->offsetSet('auth.provider.oauth', $oauth_provider);
 
-- 
cgit v1.2.1


From f460194379ece85a0f53e737dbe736a1bdfe359c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 16 Nov 2019 23:05:36 +0100
Subject: [ticket/12574] Remove passwords manager & container requirement from
 oauth

PHPBB3-12574
---
 tests/functions/user_delete_test.php | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'tests/functions/user_delete_test.php')

diff --git a/tests/functions/user_delete_test.php b/tests/functions/user_delete_test.php
index 83fda05542..f4ea5696b9 100644
--- a/tests/functions/user_delete_test.php
+++ b/tests/functions/user_delete_test.php
@@ -60,13 +60,34 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case
 		// Set up passwords manager
 		$passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers));
 
+		$plugins = new \phpbb\di\service_collection($phpbb_container);
+		$plugins->add('core.captcha.plugins.nogd');
+		$phpbb_container->set(
+			'captcha.factory',
+			new \phpbb\captcha\factory($phpbb_container, $plugins)
+		);
+		$phpbb_container->set(
+			'core.captcha.plugins.nogd',
+			new \phpbb\captcha\plugins\nogd()
+		);
+		// Set up passwords manager
+		$db_auth_provider = new \phpbb\auth\provider\db(
+			new \phpbb\captcha\factory($phpbb_container, $plugins),
+			$config,
+			$db,
+			$passwords_manager,
+			$request,
+			$user,
+			$phpbb_root_path,
+			$phpEx
+		);
+
 		$oauth_provider = new \phpbb\auth\provider\oauth\oauth(
 			$config,
-			$phpbb_container,
 			$db,
+			$db_auth_provider,
 			$phpbb_dispatcher,
 			$lang,
-			$passwords_manager,
 			$request,
 			$oauth_provider_collection,
 			$user,
-- 
cgit v1.2.1