Merge branch '3.2.x' into ticket/16159

5 files changed, 32 insertions, 1 deletions

diff --git a/tests/functions/fixtures/validate_username.xml b/tests/functions/fixtures/validate_username.xml
index 1b85a2f06d..add8f76553 100644
--- a/tests/functions/fixtures/validate_username.xml
+++ b/tests/functions/fixtures/validate_username.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dataset>
 	<table name="phpbb_groups">
+		<column>group_id</column>
 		<column>group_name</column>
 		<column>group_desc</column>
 		<row>
+			<value>10</value>
 			<value>foobar_group</value>
 			<value>test123</value>
 		</row>
diff --git a/tests/functions/get_remote_file_test.php b/tests/functions/get_remote_file_test.php
index 1550aa37e6..75e5a6dc61 100644
--- a/tests/functions/get_remote_file_test.php
+++ b/tests/functions/get_remote_file_test.php
@@ -58,7 +58,7 @@ class phpbb_functions_get_remote_file extends phpbb_test_case
 
 		$this->assertGreaterThanOrEqual(
 			2,
-			sizeof($lines),
+			count($lines),
 			'Failed asserting that the version file has at least two lines.'
 		);
 
diff --git a/tests/functions/make_clickable_test.php b/tests/functions/make_clickable_test.php
index a351a6d527..a6af12b624 100644
--- a/tests/functions/make_clickable_test.php
+++ b/tests/functions/make_clickable_test.php
@@ -53,6 +53,14 @@ class phpbb_functions_make_clickable_test extends phpbb_test_case
 				'<!-- l --><a class="postlink-local" href="http://testhost/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->'
 			),
 			array(
+				'javascript://testhost/viewtopic.php?t=1',
+				'javascript://testhost/viewtopic.php?t=1'
+			),
+			array(
+				"java\nscri\npt://testhost/viewtopic.php?t=1",
+				"java\nscri\n<!-- m --><a class=\"postlink\" href=\"pt://testhost/viewtopic.php?t=1\">pt://testhost/viewtopic.php?t=1</a><!-- m -->"
+			),
+			array(
 				'email@domain.com',
 				'<!-- e --><a href="mailto:email@domain.com">email@domain.com</a><!-- e -->'
 			),
@@ -90,6 +98,10 @@ class phpbb_functions_make_clickable_test extends phpbb_test_case
 				'<!-- m --><a class="postlink" href="ftp://ftp.täst.de/">ftp://ftp.täst.de/</a><!-- m -->'
 			),
 			array(
+				'javascript://täst.de/',
+				'javascript://täst.de/'
+			),
+			array(
 				'sip://bantu@täst.de',
 				'<!-- m --><a class="postlink" href="sip://bantu@täst.de">sip://bantu@täst.de</a><!-- m -->'
 			),
diff --git a/tests/functions/user_delete_test.php b/tests/functions/user_delete_test.php
index db9b6e0c90..f419c90e9e 100644
--- a/tests/functions/user_delete_test.php
+++ b/tests/functions/user_delete_test.php
@@ -82,6 +82,12 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case
 		$phpbb_container->set('auth.provider.oauth.service.google', $oauth_provider_google);
 		$phpbb_container->set('auth.provider_collection', $provider_collection);
 		$phpbb_container->set('notification_manager', $notification_manager);
+
+		$phpbb_container->setParameter('tables.auth_provider_oauth_token_storage', 'phpbb_oauth_tokens');
+		$phpbb_container->setParameter('tables.auth_provider_oauth_states', 'phpbb_oauth_states');
+		$phpbb_container->setParameter('tables.auth_provider_oauth_account_assoc', 'phpbb_oauth_accounts');
+
+		$phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications');
 	}
 
 	public function test_user_delete()
diff --git a/tests/functions/validate_username_test.php b/tests/functions/validate_username_test.php
index d310f58036..cee5d38400 100644
--- a/tests/functions/validate_username_test.php
+++ b/tests/functions/validate_username_test.php
@@ -47,6 +47,7 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
 				'foobar_letter_num'	=> array(),
 				'foobar_letter_num_sp'	=> array(),
 				'foobar_quot'		=> array('INVALID_CHARS'),
+				'foobar_emoji'		=> array('INVALID_EMOJIS'),
 				'barfoo_disallow'	=> array('USERNAME_DISALLOWED'),
 				'admin_taken'		=> array('USERNAME_TAKEN'),
 				'group_taken'		=> array('USERNAME_TAKEN'),
@@ -60,6 +61,7 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
 				'foobar_letter_num'	=> array(),
 				'foobar_letter_num_sp'	=> array('INVALID_CHARS'),
 				'foobar_quot'		=> array('INVALID_CHARS'),
+				'foobar_emoji'		=> array('INVALID_EMOJIS'),
 				'barfoo_disallow'	=> array('USERNAME_DISALLOWED'),
 				'admin_taken'		=> array('USERNAME_TAKEN'),
 				'group_taken'		=> array('INVALID_CHARS'),
@@ -73,6 +75,7 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
 				'foobar_letter_num'	=> array(),
 				'foobar_letter_num_sp'	=> array('INVALID_CHARS'),
 				'foobar_quot'		=> array('INVALID_CHARS'),
+				'foobar_emoji'		=> array('INVALID_EMOJIS'),
 				'barfoo_disallow'	=> array('USERNAME_DISALLOWED'),
 				'admin_taken'		=> array('USERNAME_TAKEN'),
 				'group_taken'		=> array('USERNAME_TAKEN'),
@@ -86,6 +89,7 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
 				'foobar_letter_num'	=> array(),
 				'foobar_letter_num_sp'	=> array('INVALID_CHARS'),
 				'foobar_quot'		=> array('INVALID_CHARS'),
+				'foobar_emoji'		=> array('INVALID_EMOJIS'),
 				'barfoo_disallow'	=> array('USERNAME_DISALLOWED'),
 				'admin_taken'		=> array('USERNAME_TAKEN'),
 				'group_taken'		=> array('INVALID_CHARS'),
@@ -99,6 +103,7 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
 				'foobar_letter_num'	=> array(),
 				'foobar_letter_num_sp'	=> array(),
 				'foobar_quot'		=> array('INVALID_CHARS'),
+				'foobar_emoji'		=> array('INVALID_EMOJIS'),
 				'barfoo_disallow'	=> array('USERNAME_DISALLOWED'),
 				'admin_taken'		=> array('USERNAME_TAKEN'),
 				'group_taken'		=> array('USERNAME_TAKEN'),
@@ -112,6 +117,7 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
 				'foobar_letter_num'	=> array(),
 				'foobar_letter_num_sp'	=> array('INVALID_CHARS'),
 				'foobar_quot'		=> array('INVALID_CHARS'),
+				'foobar_emoji'		=> array('INVALID_EMOJIS'),
 				'barfoo_disallow'	=> array('USERNAME_DISALLOWED'),
 				'admin_taken'		=> array('USERNAME_TAKEN'),
 				'group_taken'		=> array('USERNAME_TAKEN'),
@@ -173,6 +179,11 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
 				'"foobar"',
 				array('username'),
 			),
+			'foobar_emoji' => array(
+				$expected['foobar_emoji'],
+				'username😮',
+				array('username'),
+			),
 			'barfoo_disallow' => array(
 				$expected['barfoo_disallow'],
 				'barfoo',