Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEADmaster

10 files changed, 151 insertions, 34 deletions

diff --git a/tests/console/cache/purge_test.php b/tests/console/cache/purge_test.php
index 6c92660580..2bb4252c41 100644
--- a/tests/console/cache/purge_test.php
+++ b/tests/console/cache/purge_test.php
@@ -25,15 +25,12 @@ class phpbb_console_command_cache_purge_test extends phpbb_test_case
 	protected $db;
 	protected $config;
 
-	public function __construct()
-	{
-		$this->cache_dir = dirname(__FILE__) . '/tmp/cache/';
-	}
-
-	protected function setUp()
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 
+		$this->cache_dir = dirname(__FILE__) . '/tmp/cache/';
+
 		if (file_exists($this->cache_dir))
 		{
 			// cache directory possibly left after aborted
@@ -44,10 +41,10 @@ class phpbb_console_command_cache_purge_test extends phpbb_test_case
 
 		$this->cache = new \phpbb\cache\driver\file($this->cache_dir);
 
-		$this->db = $this->getMock('\phpbb\db\driver\driver_interface');
+		$this->db = $this->createMock('\phpbb\db\driver\driver_interface');
 
 		$this->config = new \phpbb\config\config(array('assets_version' => 1));
-		$this->user = $this->getMock('\phpbb\user', array(), array(
+		$this->user = $this->createMock('\phpbb\user', array(), array(
 			new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
 			'\phpbb\datetime')
 		);
@@ -91,7 +88,7 @@ class phpbb_console_command_cache_purge_test extends phpbb_test_case
 	public function get_command_tester()
 	{
 		$application = new Application();
-		$application->add(new purge($this->user, $this->cache, $this->db, $this->getMock('\phpbb\auth\auth'), new \phpbb\log\dummy(), $this->config));
+		$application->add(new purge($this->user, $this->cache, $this->db, $this->createMock('\phpbb\auth\auth'), new \phpbb\log\dummy(), $this->config));
 
 		$command = $application->find('cache:purge');
 		$this->command_name = $command->getName();
diff --git a/tests/console/config/config_test.php b/tests/console/config/config_test.php
index 076316217d..65bfad4757 100644
--- a/tests/console/config/config_test.php
+++ b/tests/console/config/config_test.php
@@ -20,13 +20,13 @@ class phpbb_console_command_config_test extends phpbb_test_case
 	protected $command_name;
 	protected $user;
 
-	public function setUp()
+	public function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 
 		$this->config = new \phpbb\config\config(array());
 
-		$this->user = $this->getMock('\phpbb\user', array(), array(
+		$this->user = $this->createMock('\phpbb\user', array(), array(
 			new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
 			'\phpbb\datetime')
 		);
diff --git a/tests/console/cron/cron_list_test.php b/tests/console/cron/cron_list_test.php
index fdc9a05cb2..8c7424c50d 100644
--- a/tests/console/cron/cron_list_test.php
+++ b/tests/console/cron/cron_list_test.php
@@ -30,11 +30,11 @@ class phpbb_console_command_cron_list_test extends phpbb_test_case
 
 	protected $command_tester;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		global $phpbb_root_path, $phpEx;
 
-		$this->user = $this->getMock('\phpbb\user', array(), array(
+		$this->user = $this->createMock('\phpbb\user', array(), array(
 			new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
 			'\phpbb\datetime'
 		));
@@ -74,7 +74,35 @@ class phpbb_console_command_cron_list_test extends phpbb_test_case
 			$task->set_name('command' . $i);
 			$i++;
 		}
-		$this->cron_manager = new \phpbb\cron\manager($tasks, $phpbb_root_path, $pathEx);
+
+		$mock_config = new \phpbb\config\config(array(
+			'force_server_vars' => false,
+			'enable_mod_rewrite' => '',
+		));
+
+		$mock_router = $this->getMockBuilder('\phpbb\routing\router')
+			->setMethods(array('setContext', 'generate'))
+			->disableOriginalConstructor()
+			->getMock();
+		$mock_router->method('setContext')
+			->willReturn(true);
+		$mock_router->method('generate')
+			->willReturn('foobar');
+
+		$request = new \phpbb\request\request();
+		$request->enable_super_globals();
+
+		$routing_helper = new \phpbb\routing\helper(
+			$mock_config,
+			$mock_router,
+			new \phpbb\symfony_request($request),
+			$request,
+			new \phpbb\filesystem\filesystem(),
+			$phpbb_root_path,
+			$pathEx
+		);
+
+		$this->cron_manager = new \phpbb\cron\manager($tasks, $routing_helper, $phpbb_root_path, $pathEx);
 	}
 
 	public function get_command_tester()
diff --git a/tests/console/cron/run_test.php b/tests/console/cron/run_test.php
index b4a0203325..8402f9dd3e 100644
--- a/tests/console/cron/run_test.php
+++ b/tests/console/cron/run_test.php
@@ -32,7 +32,7 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		global $db, $config, $phpbb_root_path, $phpEx;
 
@@ -40,7 +40,7 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case
 		$config = $this->config = new \phpbb\config\config(array('cron_lock' => '0'));
 		$this->lock = new \phpbb\lock\db('cron_lock', $this->config, $this->db);
 
-		$this->user = $this->getMock('\phpbb\user', array(), array(
+		$this->user = $this->createMock('\phpbb\user', array(), array(
 			new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
 			'\phpbb\datetime'
 		));
@@ -50,7 +50,35 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case
 		$tasks = array(
 			$this->task,
 		);
-		$this->cron_manager = new \phpbb\cron\manager($tasks, $phpbb_root_path, $phbEx);
+
+		$mock_config = new \phpbb\config\config(array(
+			'force_server_vars' => false,
+			'enable_mod_rewrite' => '',
+		));
+
+		$mock_router = $this->getMockBuilder('\phpbb\routing\router')
+			->setMethods(array('setContext', 'generate'))
+			->disableOriginalConstructor()
+			->getMock();
+		$mock_router->method('setContext')
+			->willReturn(true);
+		$mock_router->method('generate')
+			->willReturn('foobar');
+
+		$request = new \phpbb\request\request();
+		$request->enable_super_globals();
+
+		$routing_helper = new \phpbb\routing\helper(
+			$mock_config,
+			$mock_router,
+			new \phpbb\symfony_request($request),
+			$request,
+			new \phpbb\filesystem\filesystem(),
+			$phpbb_root_path,
+			$phpEx
+		);
+
+		$this->cron_manager = new \phpbb\cron\manager($tasks, $routing_helper, $phpbb_root_path, $phpEx);
 
 		$this->assertSame('0', $config['cron_lock']);
 	}
@@ -94,9 +122,39 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case
 
 	public function test_no_task()
 	{
+		global $phpbb_root_path, $phpEx;
+
 		$tasks = array(
 		);
-		$this->cron_manager = new \phpbb\cron\manager($tasks, $phpbb_root_path, $phpEx);
+
+		$mock_config = new \phpbb\config\config(array(
+			'force_server_vars' => false,
+			'enable_mod_rewrite' => '',
+		));
+
+		$mock_router = $this->getMockBuilder('\phpbb\routing\router')
+			->setMethods(array('setContext', 'generate'))
+			->disableOriginalConstructor()
+			->getMock();
+		$mock_router->method('setContext')
+			->willReturn(true);
+		$mock_router->method('generate')
+			->willReturn('foobar');
+
+		$request = new \phpbb\request\request();
+		$request->enable_super_globals();
+
+		$routing_helper = new \phpbb\routing\helper(
+			$mock_config,
+			$mock_router,
+			new \phpbb\symfony_request($request),
+			$request,
+			new \phpbb\filesystem\filesystem(),
+			$phpbb_root_path,
+			$phpEx
+		);
+
+		$this->cron_manager = new \phpbb\cron\manager($tasks, $routing_helper, $phpbb_root_path, $phpEx);
 		$command_tester = $this->get_command_tester();
 		$exit_status = $command_tester->execute(array('command' => $this->command_name));
 
@@ -107,9 +165,39 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case
 
 	public function test_no_task_verbose()
 	{
+		global $phpbb_root_path, $phpEx;
+
 		$tasks = array(
 		);
-		$this->cron_manager = new \phpbb\cron\manager($tasks, $phpbb_root_path, $phpEx);
+
+		$mock_config = new \phpbb\config\config(array(
+			'force_server_vars' => false,
+			'enable_mod_rewrite' => '',
+		));
+
+		$mock_router = $this->getMockBuilder('\phpbb\routing\router')
+			->setMethods(array('setContext', 'generate'))
+			->disableOriginalConstructor()
+			->getMock();
+		$mock_router->method('setContext')
+			->willReturn(true);
+		$mock_router->method('generate')
+			->willReturn('foobar');
+
+		$request = new \phpbb\request\request();
+		$request->enable_super_globals();
+
+		$routing_helper = new \phpbb\routing\helper(
+			$mock_config,
+			$mock_router,
+			new \phpbb\symfony_request($request),
+			$request,
+			new \phpbb\filesystem\filesystem(),
+			$phpbb_root_path,
+			$phpEx
+		);
+
+		$this->cron_manager = new \phpbb\cron\manager($tasks, $routing_helper, $phpbb_root_path, $phpEx);
 		$command_tester = $this->get_command_tester();
 		$exit_status = $command_tester->execute(array('command' => $this->command_name, '--verbose' => true));
 
diff --git a/tests/console/thumbnail_test.php b/tests/console/thumbnail_test.php
index e425d998a2..8f4da5a414 100644
--- a/tests/console/thumbnail_test.php
+++ b/tests/console/thumbnail_test.php
@@ -32,7 +32,7 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/thumbnail.xml');
 	}
 
-	public function setUp()
+	public function setUp(): void
 	{
 		global $config, $phpbb_root_path, $phpEx, $phpbb_filesystem;
 
@@ -50,14 +50,14 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case
 		));
 
 		$this->db = $this->db = $this->new_dbal();
-		$this->user = $this->getMock('\phpbb\user', array(), array(
+		$this->user = $this->createMock('\phpbb\user', array(), array(
 				new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
 				'\phpbb\datetime')
 		);
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->phpEx = $phpEx;
 
-		$this->cache = $this->getMock('\phpbb\cache\service', array(), array(new phpbb_mock_cache(), $this->config, $this->db, $this->phpbb_root_path, $this->phpEx));
+		$this->cache = $this->createMock('\phpbb\cache\service', array(), array(new phpbb_mock_cache(), $this->config, $this->db, $this->phpbb_root_path, $this->phpEx));
 		$this->cache->expects(self::any())->method('obtain_attach_extensions')->will(self::returnValue(array(
 			'png' => array('display_cat' => ATTACHMENT_CATEGORY_IMAGE),
 			'txt' => array('display_cat' => ATTACHMENT_CATEGORY_NONE),
@@ -76,7 +76,7 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case
 		copy(dirname(__FILE__) . '/fixtures/txt.txt', $this->phpbb_root_path . 'files/test_txt');
 	}
 
-	protected function tearDown()
+	protected function tearDown(): void
 	{
 		parent::tearDown();
 
diff --git a/tests/console/update/check_test.php b/tests/console/update/check_test.php
index 5cadc5cc97..6812ea61b8 100644
--- a/tests/console/update/check_test.php
+++ b/tests/console/update/check_test.php
@@ -84,7 +84,7 @@ class phpbb_console_command_check_test extends phpbb_test_case
 
 		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 
-		$user = $this->getMock('\phpbb\user', array(), array(
+		$user = $this->createMock('\phpbb\user', array(), array(
 			$this->language,
 			'\phpbb\datetime'
 		));
diff --git a/tests/console/user/activate_test.php b/tests/console/user/activate_test.php
index 1588a76e47..51e9754b59 100644
--- a/tests/console/user/activate_test.php
+++ b/tests/console/user/activate_test.php
@@ -21,7 +21,7 @@ class phpbb_console_user_activate_test extends phpbb_console_user_base
 {
 	protected $notifications;
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/tests/console/user/add_test.php b/tests/console/user/add_test.php
index bdfb8a8d2a..cc86cb27d3 100644
--- a/tests/console/user/add_test.php
+++ b/tests/console/user/add_test.php
@@ -61,7 +61,10 @@ class phpbb_console_user_add_test extends phpbb_console_user_base
 				$output->writeln(print_r($response, true));
 				return $response;
 			};
-			$helper = $this->getMock('\Symfony\Component\Console\Helper\QuestionHelper', array('ask'));
+			$helper = $this->getMockBuilder('\Symfony\Component\Console\Helper\QuestionHelper')
+				->setMethods(['ask'])
+				->disableOriginalConstructor()
+				->getMock();
 			$helper->expects($this->any())
 				->method('ask')
 				->will($this->returnCallback($ask));
diff --git a/tests/console/user/base.php b/tests/console/user/base.php
index ad328ac893..74f04cf686 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;
@@ -30,7 +31,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;
 
@@ -39,7 +40,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');
 
@@ -50,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',
 		));
 
@@ -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'
 		));
@@ -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)
diff --git a/tests/console/user/delete_test.php b/tests/console/user/delete_test.php
index 88f91afab1..926e496e1e 100644
--- a/tests/console/user/delete_test.php
+++ b/tests/console/user/delete_test.php
@@ -45,7 +45,7 @@ class phpbb_console_user_delete_test extends phpbb_console_user_base
 
 		$this->assertEquals(3, $this->get_user_id('Test'));
 
-		$this->question->setInputStream($this->getInputStream("yes\n"));
+		$command_tester->setInputs(['yes', '']);
 
 		$command_tester->execute(array(
 			'command'			=> $this->command_name,
@@ -63,7 +63,7 @@ class phpbb_console_user_delete_test extends phpbb_console_user_base
 
 		$this->assertNull($this->get_user_id('Foo'));
 
-		$this->question->setInputStream($this->getInputStream("yes\n"));
+		$command_tester->setInputs(['yes', '']);
 
 		$command_tester->execute(array(
 			'command'			=> $this->command_name,
@@ -80,7 +80,7 @@ class phpbb_console_user_delete_test extends phpbb_console_user_base
 
 		$this->assertEquals(3, $this->get_user_id('Test'));
 
-		$this->question->setInputStream($this->getInputStream("no\n"));
+		$command_tester->setInputs(['no', '']);
 
 		$command_tester->execute(array(
 			'command'			=> $this->command_name,