4 files changed, 191 insertions, 7 deletions
diff --git a/tests/config_php_file_test.php b/tests/config_php_file_test.php
index c2e4eb21c7..c319678108 100644
--- a/tests/config_php_file_test.php
+++ b/tests/config_php_file_test.php
@@ -17,6 +17,7 @@ class phpbb_config_php_file_test extends phpbb_test_case
 	{
 		$config_php = new \phpbb\config_php_file(dirname( __FILE__ ) . '/fixtures/', 'php');
 		$this->assertSame('bar', $config_php->get('foo'));
+		$this->assertNull($config_php->get('bar'));
 		$this->assertSame(array('foo' => 'bar', 'foo_foo' => 'bar bar'), $config_php->get_all());
 	}
 
@@ -25,6 +26,15 @@ class phpbb_config_php_file_test extends phpbb_test_case
 		$config_php = new \phpbb\config_php_file(dirname( __FILE__ ) . '/fixtures/', 'php');
 		$config_php->set_config_file(dirname( __FILE__ ) . '/fixtures/config_other.php');
 		$this->assertSame('foo', $config_php->get('bar'));
+		$this->assertNull($config_php->get('foo'));
 		$this->assertSame(array('bar' => 'foo', 'bar_bar' => 'foo foo'), $config_php->get_all());
 	}
+
+	public function test_non_existent_file()
+	{
+		$config_php = new \phpbb\config_php_file(dirname( __FILE__ ) . '/fixtures/non_existent/', 'php');
+		$this->assertNull($config_php->get('bar'));
+		$this->assertNull($config_php->get('foo'));
+		$this->assertSame(array(), $config_php->get_all());
+	}
 }
diff --git a/tests/content_visibility/delete_post_test.php b/tests/content_visibility/delete_post_test.php
index aa705c52a5..7f31dd9b28 100644
--- a/tests/content_visibility/delete_post_test.php
+++ b/tests/content_visibility/delete_post_test.php
@@ -67,6 +67,9 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 				array(
 					array('forum_posts_approved' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 3),
 				),
+				array(
+					array('user_posts' => 3),
+				),
 			),
 			array(
 				1, 1, 1,
@@ -93,6 +96,9 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 				array(
 					array('forum_posts_approved' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 3),
 				),
+				array(
+					array('user_posts' => 3),
+				),
 			),
 			array(
 				1, 1, 3,
@@ -119,6 +125,9 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 				array(
 					array('forum_posts_approved' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 2),
 				),
+				array(
+					array('user_posts' => 3),
+				),
 			),
 			array(
 				1, 1, 2,
@@ -145,6 +154,9 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 				array(
 					array('forum_posts_approved' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 1, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 3),
 				),
+				array(
+					array('user_posts' => 3),
+				),
 			),
 			array(
 				1, 1, 1,
@@ -171,6 +183,9 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 				array(
 					array('forum_posts_approved' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 1, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 3),
 				),
+				array(
+					array('user_posts' => 3),
+				),
 			),
 			array(
 				1, 1, 3,
@@ -197,6 +212,9 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 				array(
 					array('forum_posts_approved' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 1, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 2),
 				),
+				array(
+					array('user_posts' => 3),
+				),
 			),
 
 			array(
@@ -222,6 +240,9 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 				array(
 					array('forum_posts_approved' => 0, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 0, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 0),
 				),
+				array(
+					array('user_posts' => 3),
+				),
 			),
 
 			array(
@@ -257,6 +278,9 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 				array(
 					array('forum_posts_approved' => 0, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 1, 'forum_topics_approved' => 0, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 1, 'forum_last_post_id' => 0),
 				),
+				array(
+					array('user_posts' => 3),
+				),
 			),
 		);
 	}
@@ -264,7 +288,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 	/**
 	* @dataProvider delete_post_data
 	*/
-	public function test_delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason, $expected_posts, $expected_topic, $expected_forum)
+	public function test_delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason, $expected_posts, $expected_topic, $expected_forum, $expected_user)
 	{
 		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
 
@@ -313,5 +337,13 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 
 		$this->assertEquals($expected_forum, $db->sql_fetchrowset($result));
 		$db->sql_freeresult($result);
+
+		$sql = 'SELECT user_posts
+			FROM ' . USERS_TABLE . '
+			WHERE user_id = ' . (int) $data['poster_id'];
+		$result = $db->sql_query($sql);
+
+		$this->assertEquals($expected_user, $db->sql_fetchrowset($result));
+		$db->sql_freeresult($result);
 	}
 }
diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index 6cc2f8ec0f..51f9daacfb 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -288,13 +288,13 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2'));
 
 		// Create index over the column
-		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012_2'));
-		$this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'i_bug_12012_2', array('c_bug_12012_2', 'c_bool')));
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012_2'));
+		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_2'));
+		$this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'bug_12012_2', array('c_bug_12012_2', 'c_bool')));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_2'));
 
-		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012_3'));
-		$this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'i_bug_12012_3', array('c_bug_12012_2')));
-		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_bug_12012_3'));
+		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_3'));
+		$this->assertTrue($this->tools->sql_create_index('prefix_table_name', 'bug_12012_3', array('c_bug_12012_2')));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'bug_12012_3'));
 
 		// Remove the column
 		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_12012_2'));
diff --git a/tests/functions/insert_config_array_test.php b/tests/functions/insert_config_array_test.php
new file mode 100644
index 0000000000..bfcb05862e
--- /dev/null
+++ b/tests/functions/insert_config_array_test.php
@@ -0,0 +1,142 @@
+<?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.
+*
+*/
+
+class phpbb_functions_insert_config_array_test extends phpbb_test_case
+{
+	public function config_display_vars()
+	{
+		return array(
+			'legend1'		=> '',
+			'acp_config_1'	=> array(),
+			'acp_config_2'	=> array(),
+			'acp_config_3'	=> array(),
+			'acp_config_4'	=> array(),
+			'acp_config_5'	=> array(),
+		);
+	}
+
+	public function insert_config_array_data()
+	{
+		return array(
+			array( // Add a new config after 1st array item
+				array('new_config_1' => array()),
+				array('after' => 'legend1'),
+				array(
+					'legend1'		=> '',
+					'new_config_1'	=> array(),
+					'acp_config_1'	=> array(),
+					'acp_config_2'	=> array(),
+					'acp_config_3'	=> array(),
+					'acp_config_4'	=> array(),
+					'acp_config_5'	=> array(),
+				),
+			),
+			array( // Add a new config after last array item
+				array('new_config_1' => array()),
+				array('after' => 'acp_config_5'),
+				array(
+					'legend1'		=> '',
+					'acp_config_1'	=> array(),
+					'acp_config_2'	=> array(),
+					'acp_config_3'	=> array(),
+					'acp_config_4'	=> array(),
+					'acp_config_5'	=> array(),
+					'new_config_1'	=> array(),
+				),
+			),
+			array( // Add a new config before 2nd array item
+				array('new_config_1' => array()),
+				array('before' => 'acp_config_1'),
+				array(
+					'legend1'		=> '',
+					'new_config_1'	=> array(),
+					'acp_config_1'	=> array(),
+					'acp_config_2'	=> array(),
+					'acp_config_3'	=> array(),
+					'acp_config_4'	=> array(),
+					'acp_config_5'	=> array(),
+				),
+			),
+			array( // Add a new config before last config item
+				array('new_config_1' => array()),
+				array('before' => 'acp_config_5'),
+				array(
+					'legend1'		=> '',
+					'acp_config_1'	=> array(),
+					'acp_config_2'	=> array(),
+					'acp_config_3'	=> array(),
+					'acp_config_4'	=> array(),
+					'new_config_1'	=> array(),
+					'acp_config_5'	=> array(),
+				),
+			),
+			array( // When an array key does not exist
+				array('new_config_1' => array()),
+				array('after' => 'foobar'),
+				array(
+					'legend1'		=> '',
+					'acp_config_1'	=> array(),
+					'acp_config_2'	=> array(),
+					'acp_config_3'	=> array(),
+					'acp_config_4'	=> array(),
+					'acp_config_5'	=> array(),
+				),
+			),
+			array( // When after|before is not used correctly (defaults to after)
+				array('new_config_1' => array()),
+				array('foobar' => 'acp_config_1'),
+				array(
+					'legend1'		=> '',
+					'acp_config_1'	=> array(),
+					'new_config_1'	=> array(),
+					'acp_config_2'	=> array(),
+					'acp_config_3'	=> array(),
+					'acp_config_4'	=> array(),
+					'acp_config_5'	=> array(),
+				),
+			),
+			array( // Add a new config set after the last array item
+				array(
+					'legend2' => array(),
+					'new_config_1' => array(),
+					'new_config_2' => array(),
+					'new_config_3' => array(),
+				),
+				array('after' => 'acp_config_5'),
+				array(
+					'legend1'		=> '',
+					'acp_config_1'	=> array(),
+					'acp_config_2'	=> array(),
+					'acp_config_3'	=> array(),
+					'acp_config_4'	=> array(),
+					'acp_config_5'	=> array(),
+					'legend2' => array(),
+					'new_config_1' => array(),
+					'new_config_2' => array(),
+					'new_config_3' => array(),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider insert_config_array_data
+	*/
+	public function test_insert_config_array($new_config, $position, $expected)
+	{
+		$config_array = $this->config_display_vars();
+		$new_config_array = phpbb_insert_config_array($config_array, $new_config, $position);
+
+		$this->assertSame($expected, $new_config_array);
+	}
+}