From 42b7782927713c2ca2fb704db6217016347b586e Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 19 Mar 2017 21:46:20 +0700
Subject: [ticket/14972] Migrate from deprecated getMock() method to
 createMock()

PHPBB3-14972
---
 tests/console/user/base.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/console/user/base.php')

diff --git a/tests/console/user/base.php b/tests/console/user/base.php
index ad328ac893..c3e40b3cb0 100644
--- a/tests/console/user/base.php
+++ b/tests/console/user/base.php
@@ -39,7 +39,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 		$phpbb_container->set('cache.driver', new phpbb_mock_cache());
 		$phpbb_container->set('notification_manager', new phpbb_mock_notification_manager());
 
-		$auth = $this->getMock('\phpbb\auth\auth');
+		$auth = $this->createMock('\phpbb\auth\auth');
 
 		$cache = $phpbb_container->get('cache.driver');
 
@@ -62,7 +62,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 		$this->language->expects($this->any())
 			->method('lang')
 			->will($this->returnArgument(0));
-		$user = $this->user = $this->getMock('\phpbb\user', array(), array(
+		$user = $this->user = $this->createMock('\phpbb\user', array(), array(
 			$this->language,
 			'\phpbb\datetime'
 		));
-- 
cgit v1.2.1


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/console/user/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/console/user/base.php')

diff --git a/tests/console/user/base.php b/tests/console/user/base.php
index c3e40b3cb0..f8616b400f 100644
--- a/tests/console/user/base.php
+++ b/tests/console/user/base.php
@@ -30,7 +30,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		global $auth, $db, $cache, $config, $user, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path, $phpEx;
 
-- 
cgit v1.2.1


From 3f33d8957288ee988e6e276ec8cb2042eb921627 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 11 May 2019 13:40:47 +0200
Subject: [ticket/16052] Fix issues caused by merges

PHPBB3-16052
---
 tests/console/user/base.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests/console/user/base.php')

diff --git a/tests/console/user/base.php b/tests/console/user/base.php
index f8616b400f..94a51eb896 100644
--- a/tests/console/user/base.php
+++ b/tests/console/user/base.php
@@ -20,6 +20,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 	protected $log;
 	protected $passwords_manager;
 	protected $command_name;
+	/** @var Symfony\Component\Console\Helper\QuestionHelper */
 	protected $question;
 	protected $user_loader;
 	protected $phpbb_root_path;
-- 
cgit v1.2.1


From 60bc949ba1d5a6851e525868f69e997d4c8a2075 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 3 Oct 2019 23:05:02 +0200
Subject: [ticket/14465] Remove setting for maximum password length

PHPBB3-14465
---
 tests/console/user/base.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tests/console/user/base.php')

diff --git a/tests/console/user/base.php b/tests/console/user/base.php
index 94a51eb896..b845ab1639 100644
--- a/tests/console/user/base.php
+++ b/tests/console/user/base.php
@@ -51,7 +51,6 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 			'min_name_chars'	=> 3,
 			'max_name_chars'	=> 10,
 			'min_pass_chars'	=> 3,
-			'max_pass_chars'	=> 10,
 			'pass_complex'		=> 'PASS_TYPE_ANY',
 		));
 
-- 
cgit v1.2.1


From dcab0762210a4059cca7458344dcc1aeb0360c42 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 29 Dec 2019 02:12:36 +0700
Subject: [ticket/16276] Further fix PHP nightly tests

PHPBB3-16276
---
 tests/console/user/base.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/console/user/base.php')

diff --git a/tests/console/user/base.php b/tests/console/user/base.php
index b845ab1639..74f04cf686 100644
--- a/tests/console/user/base.php
+++ b/tests/console/user/base.php
@@ -112,7 +112,8 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
 
-		return $row['user_id'];
+		$user_id = $row ? $row['user_id'] : null;
+		return $user_id;
 	}
 
 	public function getInputStream($input)
-- 
cgit v1.2.1