10 files changed, 107 insertions, 194 deletions
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index 9e826a3a59..0a64bfd69f 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -99,7 +99,7 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
 		$this->config['allow_avatar_' . get_class($this->avatar_barfoo)] = false;
 
 		// Set up avatar manager
-		$this->manager = new \phpbb\avatar\manager($this->config, $avatar_drivers, $phpbb_container);
+		$this->manager = new \phpbb\avatar\manager($this->config, $dispatcher, $avatar_drivers);
 		$this->db = $this->new_dbal();
 		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
 		$lang = new \phpbb\language\language($lang_loader);
diff --git a/tests/cache/cache_memory.php b/tests/cache/cache_memory.php
index 806edb963a..565e9a48eb 100644
--- a/tests/cache/cache_memory.php
+++ b/tests/cache/cache_memory.php
@@ -18,7 +18,7 @@ class phpbb_cache_memory extends \phpbb\cache\driver\memory
 	/**
 	* Set cache path
 	*/
-	function phpbb_cache_memory()
+	function __construct()
 	{
 	}
 
diff --git a/tests/console/thumbnail_test.php b/tests/console/thumbnail_test.php
index 439e3623fa..d5fbfa0fed 100644
--- a/tests/console/thumbnail_test.php
+++ b/tests/console/thumbnail_test.php
@@ -46,7 +46,6 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case
 		$config = $this->config = new \phpbb\config\config(array(
 			'img_min_thumb_filesize' => 2,
 			'img_max_thumb_width' => 2,
-			'img_imagick' => '',
 		));
 
 		$this->db = $this->db = $this->new_dbal();
diff --git a/tests/functional/acp_attachments_test.php b/tests/functional/acp_attachments_test.php
deleted file mode 100644
index 8e810a508a..0000000000
--- a/tests/functional/acp_attachments_test.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
-
-/**
- * @group functional
- */
-class phpbb_functional_acp_attachments_test extends phpbb_functional_test_case
-{
-	public function data_imagick_path_linux()
-	{
-		return array(
-			array('/usr/bin', 'Configuration updated successfully'),
-			array('/usr/foobar', 'The entered path “/usr/foobar” does not exist.'),
-			array('/usr/bin/which', 'The entered path “/usr/bin/which” is not a directory.'),
-		);
-	}
-
-	/**
-	 * @dataProvider data_imagick_path_linux
-	 */
-	public function test_imagick_path_linux($imagick_path, $expected)
-	{
-		if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux')
-		{
-			$this->markTestSkipped('Unable to test linux specific paths on other OS.');
-		}
-
-		$this->login();
-		$this->admin_login();
-
-		$crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid);
-
-		$form = $crawler->selectButton('Submit')->form(array('config[img_imagick]'	=> $imagick_path));
-
-		$crawler = self::submit($form);
-		$this->assertContains($expected, $crawler->filter('#main')->text());
-	}
-
-	public function data_imagick_path_windows()
-	{
-		return array(
-			array('C:\Windows', 'Configuration updated successfully'),
-			array('C:\Windows\foobar1', 'The entered path “C:\Windows\foobar1” does not exist.'),
-			array('C:\Windows\explorer.exe', 'The entered path “C:\Windows\explorer.exe” is not a directory.'),
-		);
-	}
-
-	/**
-	 * @dataProvider data_imagick_path_windows
-	 */
-	public function test_imagick_path_windows($imagick_path, $expected)
-	{
-		if (strtolower(substr(PHP_OS, 0, 3)) !== 'win')
-		{
-			$this->markTestSkipped('Unable to test windows specific paths on other OS.');
-		}
-
-		$this->login();
-		$this->admin_login();
-
-		$crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid);
-
-		$form = $crawler->selectButton('Submit')->form(array('config[img_imagick]'	=> $imagick_path));
-
-		$crawler = self::submit($form);
-		$this->assertContains($expected, $crawler->filter('#main')->text());
-	}
-}
diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index d381fa1ae2..b0780172ff 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php
@@ -99,7 +99,6 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 
 		$form = $crawler->selectButton('Submit')->form(array(
 			'config[check_attachment_content]'	=> 0,
-			'config[img_imagick]'				=> '',
 		));
 		self::submit($form);
 
diff --git a/tests/functional/user_password_reset_test.php b/tests/functional/user_password_reset_test.php
index 3da78407cf..2361eed066 100644
--- a/tests/functional/user_password_reset_test.php
+++ b/tests/functional/user_password_reset_test.php
@@ -21,25 +21,56 @@ class phpbb_functional_user_password_reset_test extends phpbb_functional_test_ca
 	public function test_password_reset()
 	{
 		$this->add_lang('ucp');
-		$user_id = $this->create_user('reset-password-test-user');
+		$user_id = $this->create_user('reset-password-test-user', 'reset-password-test-user@test.com');
 
+		// test without email
+		$crawler = self::request('GET', "ucp.php?mode=sendpassword&sid={$this->sid}");
+		$form = $crawler->selectButton('submit')->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('NO_EMAIL_USER', $crawler->text());
+
+		// test with non-existent email
 		$crawler = self::request('GET', "ucp.php?mode=sendpassword&sid={$this->sid}");
 		$form = $crawler->selectButton('submit')->form(array(
-			'username'	=> 'reset-password-test-user',
+			'email'	=> 'non-existent@email.com',
 		));
 		$crawler = self::submit($form);
-		$this->assertContainsLang('NO_EMAIL_USER', $crawler->text());
+		$this->assertContainsLang('PASSWORD_UPDATED_IF_EXISTED', $crawler->text());
 
+		// test with correct email
 		$crawler = self::request('GET', "ucp.php?mode=sendpassword&sid={$this->sid}");
 		$form = $crawler->selectButton('submit')->form(array(
-			'username'	=> 'reset-password-test-user',
-			'email'		=> 'nobody@example.com',
+			'email'		=> 'reset-password-test-user@test.com',
+		));
+		$crawler = self::submit($form);
+		$this->assertContainsLang('PASSWORD_UPDATED_IF_EXISTED', $crawler->text());
+
+		// Check if columns in database were updated for password reset
+		$this->get_user_data('reset-password-test-user');
+		$this->assertNotNull($this->user_data['user_actkey']);
+		$this->assertNotNull($this->user_data['user_newpasswd']);
+
+		// Create another user with the same email
+		$this->create_user('reset-password-test-user1', 'reset-password-test-user@test.com');
+
+		// Test that username is now also required
+		$crawler = self::request('GET', "ucp.php?mode=sendpassword&sid={$this->sid}");
+		$form = $crawler->selectButton('submit')->form(array(
+			'email'		=> 'reset-password-test-user@test.com',
+		));
+		$crawler = self::submit($form);
+		$this->assertContainsLang('EMAIL_NOT_UNIQUE', $crawler->text());
+
+		// Provide both username and email
+		$form = $crawler->selectButton('submit')->form(array(
+			'email'		=> 'reset-password-test-user@test.com',
+			'username'	=> 'reset-password-test-user1',
 		));
 		$crawler = self::submit($form);
-		$this->assertContainsLang('PASSWORD_UPDATED', $crawler->text());
+		$this->assertContainsLang('PASSWORD_UPDATED_IF_EXISTED', $crawler->text());
 
 		// Check if columns in database were updated for password reset
-		$this->get_user_data();
+		$this->get_user_data('reset-password-test-user1');
 		$this->assertNotNull($this->user_data['user_actkey']);
 		$this->assertNotNull($this->user_data['user_newpasswd']);
 
@@ -73,7 +104,7 @@ class phpbb_functional_user_password_reset_test extends phpbb_functional_test_ca
 	public function test_activate_new_password($expected, $user_id, $act_key)
 	{
 		$this->add_lang('ucp');
-		$this->get_user_data();
+		$this->get_user_data('reset-password-test-user');
 		$user_id = (!$user_id) ? $this->user_data['user_id'] : $user_id;
 		$act_key = (!$act_key) ? $this->user_data['user_actkey'] : $act_key;
 
@@ -119,7 +150,7 @@ class phpbb_functional_user_password_reset_test extends phpbb_functional_test_ca
 	public function test_acivateAfterDeactivate()
 	{
 		// User is active, actkey should not exist
-		$this->get_user_data();
+		$this->get_user_data('reset-password-test-user');
 		$this->assertEmpty($this->user_data['user_actkey']);
 
 		$this->login();
@@ -143,7 +174,7 @@ class phpbb_functional_user_password_reset_test extends phpbb_functional_test_ca
 		$crawler = self::request('GET', preg_replace('#(.+)(adm/index.php.+)#', '$2', $link->getUri()));
 
 		// Ensure again that actkey is empty after deactivation
-		$this->get_user_data();
+		$this->get_user_data('reset-password-test-user');
 		$this->assertEmpty($this->user_data['user_actkey']);
 
 		// Force reactivation of account and check that act key is not empty anymore
@@ -152,16 +183,16 @@ class phpbb_functional_user_password_reset_test extends phpbb_functional_test_ca
 		$crawler = self::submit($form, array('action' => 'reactivate'));
 		$this->assertContainsLang('FORCE_REACTIVATION_SUCCESS', $crawler->filter('html')->text());
 
-		$this->get_user_data();
+		$this->get_user_data('reset-password-test-user');
 		$this->assertNotEmpty($this->user_data['user_actkey']);
 	}
 
-	protected function get_user_data()
+	protected function get_user_data($username)
 	{
 		$db = $this->get_db();
 		$sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey, user_inactive_reason
 			FROM ' . USERS_TABLE . "
-			WHERE username = 'reset-password-test-user'";
+			WHERE username = '" . $db->sql_escape($username) . "'";
 		$result = $db->sql_query($sql);
 		$this->user_data = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
diff --git a/tests/functions_acp/validate_config_vars_test.php b/tests/functions_acp/validate_config_vars_test.php
index 5c31888291..1182d659f0 100644
--- a/tests/functions_acp/validate_config_vars_test.php
+++ b/tests/functions_acp/validate_config_vars_test.php
@@ -161,100 +161,4 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
 
 		$this->assertEquals($expected, $phpbb_error);
 	}
-
-	public function data_validate_path_linux()
-	{
-		return array(
-			array('/usr/bin', 'absolute_path', true),
-			array('/usr/bin/', 'absolute_path:50:200', true),
-			array('/usr/bin/which', 'absolute_path', 'DIRECTORY_NOT_DIR'),
-			array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-			array('C:\Windows', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-			array('.', 'absolute_path', true),
-			array('', 'absolute_path', true),
-			array('mkdir /foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-			// Make sure above command didn't do anything
-			array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-		);
-	}
-
-	/**
-	 * @dataProvider data_validate_path_linux
-	 */
-	public function test_validate_path_linux($path, $validation_type, $expected)
-	{
-		if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux')
-		{
-			$this->markTestSkipped('Unable to test linux specific paths on other OS.');
-		}
-
-		$error = array();
-		$config_ary = array(
-			'path' => $path,
-		);
-
-		validate_config_vars(array(
-				'path'	=> array('lang' => 'FOOBAR', 'validate' => $validation_type),
-			),
-			$config_ary,
-			$error
-		);
-
-		if ($expected === true)
-		{
-			$this->assertEmpty($error);
-		}
-		else
-		{
-			$this->assertEquals(array($expected), $error);
-		}
-	}
-
-	public function data_validate_path_windows()
-	{
-		return array(
-			array('C:\Windows', 'absolute_path', true),
-			array('C:\Windows\\', 'absolute_path:50:200', true),
-			array('C:\Windows\explorer.exe', 'absolute_path', 'DIRECTORY_NOT_DIR'),
-			array('C:\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-			array('/usr/bin', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-			array('.', 'absolute_path', true),
-			array('', 'absolute_path', true),
-			array('mkdir C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-			// Make sure above command didn't do anything
-			array('C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-		);
-	}
-
-	/**
-	 * @dataProvider data_validate_path_windows
-	 */
-	public function test_validate_path_windows($path, $validation_type, $expected)
-	{
-		if (strtolower(substr(PHP_OS, 0, 3)) !== 'win')
-		{
-			$this->markTestSkipped('Unable to test windows specific paths on other OS.');
-		}
-
-		$error = array();
-		$config_ary = array(
-			'path' => $path,
-		);
-
-		validate_config_vars(array(
-			'path'	=> array('lang' => 'FOOBAR', 'validate' => $validation_type),
-		),
-			$config_ary,
-			$error
-		);
-
-		if ($expected === true)
-		{
-			$this->assertEmpty($error);
-		}
-		else
-		{
-			$this->assertEquals(array($expected), $error);
-		}
-	}
 }
diff --git a/tests/functions_content/phpbb_format_quote_test.php b/tests/functions_content/phpbb_format_quote_test.php
new file mode 100644
index 0000000000..cbbd46d0a9
--- /dev/null
+++ b/tests/functions_content/phpbb_format_quote_test.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php';
+
+class phpbb_functions_content_phpbb_format_quote_test extends phpbb_test_case
+{
+	/** @var \phpbb\language\language */
+	protected $lang;
+
+	public function setUp()
+	{
+		global $cache, $user, $phpbb_root_path, $phpEx;
+
+		$lang_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$this->lang = new \phpbb\language\language($lang_file_loader);
+		$user = new \phpbb\user($this->lang, '\phpbb\datetime');
+		$cache = new phpbb_mock_cache();
+
+		parent::setUp();
+	}
+
+	public function data_phpbb_format_quote()
+	{
+		return [
+			[true, ['author' => 'admin', 'user_id' => 2], '[quote=&quot;username&quot;]quoted[/quote]', '', "[quote=admin user_id=2][quote=&quot;username&quot;]quoted[/quote][/quote]\n\n"],
+			[false, ['author' => 'admin', 'user_id' => 2], '[quote=&quot;username&quot;]quoted[/quote]', '', "admin wrote:\n&gt; [quote=&quot;username&quot;]quoted[/quote]\n"],
+			[true, ['author' => 'admin', 'user_id' => 2], '[quote=&quot;username&quot;]quoted[/quote]', "[url=http://viewtopic.php?p=1#p1]Subject: Foo[/url]\n\n", "[url=http://viewtopic.php?p=1#p1]Subject: Foo[/url]\n\n[quote=admin user_id=2][quote=&quot;username&quot;]quoted[/quote][/quote]\n\n"],
+			[false, ['author' => 'admin', 'user_id' => 2],  '[quote=&quot;username&quot;]quoted[/quote]', "http://viewtopic.php?p=1#p1 - Subject: Foo\n\n", "http://viewtopic.php?p=1#p1 - Subject: Foo\n\nadmin wrote:\n&gt; [quote=&quot;username&quot;]quoted[/quote]\n"],
+		];
+	}
+
+
+	/**
+	 * @dataProvider data_phpbb_format_quote
+	 */
+	public function test_phpbb_format_quote($bbcode_status, $quote_attributes, $message, $message_link, $expected)
+	{
+		$text_formatter_utils = new \phpbb\textformatter\s9e\utils();
+
+		$message_parser = new parse_message($message);
+
+		phpbb_format_quote($this->lang, $message_parser, $text_formatter_utils, $bbcode_status, $quote_attributes, $message_link);
+
+		$this->assertEquals($expected, $message_parser->message);
+	}
+}
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 12a296a4bf..d4856f954a 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -550,9 +550,10 @@ class phpbb_functional_test_case extends phpbb_test_case
 	* Creates a new user with limited permissions
 	*
 	* @param string $username Also doubles up as the user's password
+	* @param string $email User email (defaults to nobody@example.com)
 	* @return int ID of created user
 	*/
-	protected function create_user($username)
+	protected function create_user($username, $email = 'nobody@example.com')
 	{
 		// Required by unique_id
 		global $config;
@@ -604,7 +605,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$user_row = array(
 			'username' => $username,
 			'group_id' => 2,
-			'user_email' => 'nobody@example.com',
+			'user_email' => $email,
 			'user_type' => 0,
 			'user_lang' => 'en',
 			'user_timezone' => 'UTC',
diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 18b6deed1f..b41b95d925 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -79,7 +79,7 @@ class phpbb_filespec_test extends phpbb_test_case
 		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
-	private function set_reflection_property(&$class, $property_name, $value)
+	private function set_reflection_property($class, $property_name, $value)
 	{
 		$property = new ReflectionProperty($class, $property_name);
 		$property->setAccessible(true);