12 files changed, 349 insertions, 287 deletions
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 2856ba02bb..bb4a703cc3 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -31,5 +31,4 @@ require_once 'test_framework/phpbb_test_case_helpers.php';
 require_once 'test_framework/phpbb_test_case.php';
 require_once 'test_framework/phpbb_database_test_case.php';
 require_once 'test_framework/phpbb_database_test_connection_manager.php';
-require_once 'test_framework/phpbb_mink_test_case.php';
 require_once 'test_framework/phpbb_functional_test_case.php';
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/functional/download_test.php b/tests/functional/download_test.php
index 6a6df14c81..4e4995c21e 100644
--- a/tests/functional/download_test.php
+++ b/tests/functional/download_test.php
@@ -80,20 +80,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 			'attachments' => true,
 		));
 
-		// Download topic archive as guest
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
-		// Download post archive as guest
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
 		// Download attachment as guest
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
@@ -147,18 +133,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		));
 		$this->add_lang('viewtopic');
 
-		// Download topic archive as guest: still works
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
-		// No download post archive as guest
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_html(404);
-		$this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text());
-
 		// No download attachment as guest
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_html(404);
@@ -167,20 +141,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		// Login as admin and try again, should work now.
 		$this->login();
 
-		// Download topic archive as admin
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
-		// Download post archive as admin
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
 		// Download attachment as admin
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
@@ -235,16 +195,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		));
 		$this->add_lang('viewtopic');
 
-		// Download topic archive as guest: still works
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_html(404);
-		$this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text());
-
-		// No download post archive as guest
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_html(404);
-		$this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text());
-
 		// No download attachment as guest
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_html(404);
@@ -253,20 +203,6 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 		// Login as admin and try again, should work now.
 		$this->login();
 
-		// Download topic archive as admin
-		$crawler = self::request('GET', "download/file.php?archive=.zip&topic_id={$this->data['topics']['Download Topic #1']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
-		// Download post archive as admin
-		$crawler = self::request('GET', "download/file.php?archive=.zip&post_id={$this->data['posts']['Re: Download Topic #1-#2']}", array(), false);
-		self::assert_response_status_code(200);
-		$content = self::$client->getResponse()->getContent();
-		$finfo = new finfo(FILEINFO_MIME_TYPE);
-		self::assertEquals('application/zip', $finfo->buffer($content));
-
 		// Download attachment as admin
 		$crawler = self::request('GET', "download/file.php?id={$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false);
 		self::assert_response_status_code(200);
diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index 29036c821e..e87953367f 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php
@@ -42,8 +42,6 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 
 			unlink($fileinfo->getPathname());
 		}
-
-		parent::tearDown();
 	}
 
 	private function upload_file($filename, $mimetype)
diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php
index ef39e1d71b..6ece150b23 100644
--- a/tests/functional/fileupload_remote_test.php
+++ b/tests/functional/fileupload_remote_test.php
@@ -45,8 +45,6 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
 		global $config, $user;
 		$user = null;
 		$config = array();
-
-		parent::tearDown();
 	}
 
 	public function test_invalid_extension()
diff --git a/tests/functional/forgot_password_test.php b/tests/functional/forgot_password_test.php
index c95efc5b2e..64fa19557f 100644
--- a/tests/functional/forgot_password_test.php
+++ b/tests/functional/forgot_password_test.php
@@ -57,7 +57,5 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
 			'config[allow_password_reset]'	=> 1,
 		));
 		$crawler = self::submit($form);
-
-		parent::tearDown();
 	}
 }
diff --git a/tests/functional/plupload_test.php b/tests/functional/plupload_test.php
index d9faec035c..ee71597ffc 100644
--- a/tests/functional/plupload_test.php
+++ b/tests/functional/plupload_test.php
@@ -57,8 +57,6 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case
 
 			unlink($fileinfo->getPathname());
 		}
-
-		parent::tearDown();
 	}
 
 	public function get_urls()
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);
+	}
+}
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 9bb4d69bf4..80e6293ff9 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -11,12 +11,14 @@
 *
 */
 use Symfony\Component\BrowserKit\CookieJar;
-use Behat\Mink\Driver\Goutte\Client;
-use Behat\Mink\Driver\GoutteDriver;
 
-class phpbb_functional_test_case extends phpbb_mink_test_case
+require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
+
+class phpbb_functional_test_case extends phpbb_test_case
 {
+	static protected $client;
 	static protected $cookieJar;
+	static protected $root_url;
 
 	protected $cache = null;
 	protected $db = null;
@@ -34,6 +36,7 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 	*/
 	protected $lang = array();
 
+	static protected $config = array();
 	static protected $already_installed = false;
 
 	static public function setUpBeforeClass()
@@ -43,24 +46,6 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 		self::$config = phpbb_test_case_helpers::get_test_config();
 		self::$root_url = self::$config['phpbb_functional_url'];
 
-		self::$cookieJar = new CookieJar;
-		self::$client = new Client(array(), null, self::$cookieJar);
-
-		$client_options = array(
-			Guzzle\Http\Client::DISABLE_REDIRECTS	=> true,
-			'curl.options'	=> array(
-				CURLOPT_TIMEOUT	=> 120,
-			),
-		);
-
-		self::$client->setClient(new Guzzle\Http\Client('', $client_options));
-
-		// Reset the curl handle because it is 0 at this point and not a valid
-		// resource
-		self::$client->getClient()->getCurlMulti()->reset(true);
-
-		self::$driver = new GoutteDriver(self::$client);
-
 		// Important: this is used both for installation and by
 		// test cases for querying the tables.
 		// Therefore table prefix must be set before a board is
@@ -93,6 +78,12 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 
 		$this->bootstrap();
 
+		self::$cookieJar = new CookieJar;
+		self::$client = new Goutte\Client(array(), null, self::$cookieJar);
+		// Reset the curl handle because it is 0 at this point and not a valid
+		// resource
+		self::$client->getClient()->getCurlMulti()->reset(true);
+
 		// Clear the language array so that things
 		// that were added in other tests are gone
 		$this->lang = array();
@@ -119,14 +110,13 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 
 	protected function tearDown()
 	{
+		parent::tearDown();
+
 		if ($this->db instanceof \phpbb\db\driver\driver_interface)
 		{
 			// Close the database connections again this test
 			$this->db->sql_close();
 		}
-
-		self::$cookieJar->clear();
-		parent::tearDown();
 	}
 
 	/**
@@ -266,6 +256,144 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 		return $extension_manager;
 	}
 
+	static protected function install_board()
+	{
+		global $phpbb_root_path, $phpEx;
+
+		self::recreate_database(self::$config);
+
+		$config_file = $phpbb_root_path . "config.$phpEx";
+		$config_file_dev = $phpbb_root_path . "config_dev.$phpEx";
+		$config_file_test = $phpbb_root_path . "config_test.$phpEx";
+
+		if (file_exists($config_file))
+		{
+			if (!file_exists($config_file_dev))
+			{
+				rename($config_file, $config_file_dev);
+			}
+			else
+			{
+				unlink($config_file);
+			}
+		}
+
+		self::$cookieJar = new CookieJar;
+		self::$client = new Goutte\Client(array(), null, self::$cookieJar);
+		// Set client manually so we can increase the cURL timeout
+		self::$client->setClient(new Guzzle\Http\Client('', array(
+			Guzzle\Http\Client::DISABLE_REDIRECTS	=> true,
+			'curl.options'	=> array(
+				CURLOPT_TIMEOUT	=> 120,
+			),
+		)));
+
+		// Reset the curl handle because it is 0 at this point and not a valid
+		// resource
+		self::$client->getClient()->getCurlMulti()->reset(true);
+
+		$parseURL = parse_url(self::$config['phpbb_functional_url']);
+
+		$crawler = self::request('GET', 'install/index.php?mode=install');
+		self::assertContains('Welcome to Installation', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		// install/index.php?mode=install&sub=requirements
+		$crawler = self::submit($form);
+		self::assertContains('Installation compatibility', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		// install/index.php?mode=install&sub=database
+		$crawler = self::submit($form);
+		self::assertContains('Database configuration', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form(array(
+			// Installer uses 3.0-style dbms name
+			'dbms'			=> str_replace('phpbb\db\driver\\', '',  self::$config['dbms']),
+			'dbhost'		=> self::$config['dbhost'],
+			'dbport'		=> self::$config['dbport'],
+			'dbname'		=> self::$config['dbname'],
+			'dbuser'		=> self::$config['dbuser'],
+			'dbpasswd'		=> self::$config['dbpasswd'],
+			'table_prefix'	=> self::$config['table_prefix'],
+		));
+
+		// install/index.php?mode=install&sub=database
+		$crawler = self::submit($form);
+		self::assertContains('Successful connection', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		// install/index.php?mode=install&sub=administrator
+		$crawler = self::submit($form);
+		self::assertContains('Administrator configuration', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form(array(
+			'default_lang'	=> 'en',
+			'admin_name'	=> 'admin',
+			'admin_pass1'	=> 'adminadmin',
+			'admin_pass2'	=> 'adminadmin',
+			'board_email'	=> 'nobody@example.com',
+		));
+
+		// install/index.php?mode=install&sub=administrator
+		$crawler = self::submit($form);
+		self::assertContains('Tests passed', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		// We have to skip install/index.php?mode=install&sub=config_file
+		// because that step will create a config.php file if phpBB has the
+		// permission to do so. We have to create the config file on our own
+		// in order to get the DEBUG constants defined.
+		$config_php_data = phpbb_create_config_file_data(self::$config, self::$config['dbms'], true, false, true);
+		$config_created = file_put_contents($config_file, $config_php_data) !== false;
+		if (!$config_created)
+		{
+			self::markTestSkipped("Could not write $config_file file.");
+		}
+
+		// We also have to create a install lock that is normally created by
+		// the installer. The file will be removed by the final step of the
+		// installer.
+		$install_lock_file = $phpbb_root_path . 'cache/install_lock';
+		$lock_created = file_put_contents($install_lock_file, '') !== false;
+		if (!$lock_created)
+		{
+			self::markTestSkipped("Could not create $lock_created file.");
+		}
+		@chmod($install_lock_file, 0666);
+
+		// install/index.php?mode=install&sub=advanced
+		$form_data = $form->getValues();
+		unset($form_data['submit']);
+
+		$crawler = self::request('POST', 'install/index.php?mode=install&sub=advanced', $form_data);
+		self::assertContains('The settings on this page are only necessary to set if you know that you require something different from the default.', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form(array(
+			'email_enable'		=> true,
+			'smtp_delivery'		=> true,
+			'smtp_host'			=> 'nxdomain.phpbb.com',
+			'smtp_auth'			=> 'PLAIN',
+			'smtp_user'			=> 'nxuser',
+			'smtp_pass'			=> 'nxpass',
+			'cookie_secure'		=> false,
+			'force_server_vars'	=> false,
+			'server_protocol'	=> $parseURL['scheme'] . '://',
+			'server_name'		=> 'localhost',
+			'server_port'		=> isset($parseURL['port']) ? (int) $parseURL['port'] : 80,
+			'script_path'		=> $parseURL['path'],
+		));
+
+		// install/index.php?mode=install&sub=create_table
+		$crawler = self::submit($form);
+		self::assertContains('The database tables used by phpBB', $crawler->filter('#main')->text());
+		self::assertContains('have been created and populated with some initial data.', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		// install/index.php?mode=install&sub=final
+		$crawler = self::submit($form);
+		self::assertContains('You have successfully installed', $crawler->text());
+
+		copy($config_file, $config_file_test);
+	}
+
 	public function install_ext($extension)
 	{
 		$this->login();
@@ -284,6 +412,12 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 		$this->logout();
 	}
 
+	static private function recreate_database($config)
+	{
+		$db_conn_mgr = new phpbb_database_test_connection_manager($config);
+		$db_conn_mgr->recreate_db();
+	}
+
 	/**
 	* Creates a new style
 	*
diff --git a/tests/test_framework/phpbb_mink_test_case.php b/tests/test_framework/phpbb_mink_test_case.php
deleted file mode 100644
index ba480e35fb..0000000000
--- a/tests/test_framework/phpbb_mink_test_case.php
+++ /dev/null
@@ -1,183 +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.
-*
-*/
-use \Behat\Mink\Session;
-
-require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
-
-abstract class phpbb_mink_test_case extends phpbb_test_case
-{
-	static protected $driver;
-	static protected $client;
-	static protected $session;
-	static protected $config = array();
-	static protected $root_url;
-
-	public function __construct($name = null, array $data = array(), $dataName = '')
-	{
-		parent::__construct($name, $data, $dataName);
-
-		$this->backupStaticAttributesBlacklist += array(
-			'phpbb_mink_test_case' => array('config', 'already_installed'),
-		);
-	}
-
-	static public function setUpBeforeClass()
-	{
-		parent::setUpBeforeClass();
-	}
-
-	public function setUp()
-	{
-		parent::setUp();
-
-		if (!self::$driver)
-		{
-			self::markTestSkipped('Mink driver not initialized.');
-		}
-
-		if (!self::$session)
-		{
-			self::$session = new Session(self::$driver);
-		}
-	}
-
-	static protected function recreate_database($config)
-	{
-		$db_conn_mgr = new phpbb_database_test_connection_manager($config);
-		$db_conn_mgr->recreate_db();
-	}
-
-	protected function tearDown()
-	{
-		self::$session->reset();
-		parent::tearDown();
-	}
-
-	static protected function visit($path)
-	{
-		self::$session->visit(self::$root_url . $path);
-		return self::$session->getPage();
-	}
-
-	static protected function click_submit($submit_button_id = 'submit')
-	{
-		self::$session->getPage()->findById($submit_button_id)->click();
-		return self::$session->getPage();
-	}
-
-	static protected function install_board()
-	{
-		global $phpbb_root_path, $phpEx;
-
-		self::recreate_database(self::$config);
-		self::$session = new Session(self::$driver);
-
-		$config_file = $phpbb_root_path . "config.$phpEx";
-		$config_file_dev = $phpbb_root_path . "config_dev.$phpEx";
-		$config_file_test = $phpbb_root_path . "config_test.$phpEx";
-
-		if (file_exists($config_file))
-		{
-			if (!file_exists($config_file_dev))
-			{
-				rename($config_file, $config_file_dev);
-			}
-			else
-			{
-				unlink($config_file);
-			}
-		}
-
-		$parseURL = parse_url(self::$config['phpbb_functional_url']);
-
-		$page = self::visit('install/index.php?mode=install');
-		self::assertContains('Welcome to Installation', $page->findById('main')->getText());
-
-		// install/index.php?mode=install&sub=requirements
-		$page = self::click_submit();
-		self::assertContains('Installation compatibility', $page->findById('main')->getText());
-
-		// install/index.php?mode=install&sub=database
-		$page = self::click_submit();
-		self::assertContains('Database configuration', $page->findById('main')->getText());
-
-		$page->findById('dbms')->setValue(str_replace('phpbb\db\driver\\', '',  self::$config['dbms']));
-		$page->findById('dbhost')->setValue(self::$config['dbhost']);
-		$page->findById('dbport')->setValue(self::$config['dbport']);
-		$page->findById('dbname')->setValue(self::$config['dbname']);
-		$page->findById('dbuser')->setValue(self::$config['dbuser']);
-		$page->findById('dbpasswd')->setValue(self::$config['dbpasswd']);
-		$page->findById('table_prefix')->setValue(self::$config['table_prefix']);
-
-		// install/index.php?mode=install&sub=database
-		$page = self::click_submit();
-		self::assertContains('Successful connection', $page->findById('main')->getText());
-
-		// install/index.php?mode=install&sub=administrator
-		$page = self::click_submit();
-		self::assertContains('Administrator configuration', $page->findById('main')->getText());
-
-		$page->findById('admin_name')->setValue('admin');
-		$page->findById('admin_pass1')->setValue('adminadmin');
-		$page->findById('admin_pass2')->setValue('adminadmin');
-		$page->findById('board_email')->setValue('nobody@example.com');
-
-		// install/index.php?mode=install&sub=administrator
-		$page = self::click_submit();
-		self::assertContains('Tests passed', $page->findById('main')->getText());
-
-		// install/index.php?mode=install&sub=config_file
-		$page = self::click_submit();
-
-		// Installer has created a config.php file, we will overwrite it with a
-		// config file of our own in order to get the DEBUG constants defined
-		$config_php_data = phpbb_create_config_file_data(self::$config, self::$config['dbms'], true, false, true);
-		$config_created = file_put_contents($config_file, $config_php_data) !== false;
-		if (!$config_created)
-		{
-			self::markTestSkipped("Could not write $config_file file.");
-		}
-
-		if (strpos($page->findById('main')->getText(), 'The configuration file has been written') === false)
-		{
-			$page = self::click_submit('dldone');
-		}
-		self::assertContains('The configuration file has been written', $page->findById('main')->getText());
-
-		// install/index.php?mode=install&sub=advanced
-		$page = self::click_submit();
-		self::assertContains('The settings on this page are only necessary to set if you know that you require something different from the default.', $page->findById('main')->getText());
-
-		$page->findById('smtp_delivery')->setValue('1');
-		$page->findById('smtp_host')->setValue('nxdomain.phpbb.com');
-		$page->findById('smtp_user')->setValue('nxuser');
-		$page->findById('smtp_pass')->setValue('nxpass');
-		$page->findById('server_protocol')->setValue($parseURL['scheme'] . '://');
-		$page->findById('server_name')->setValue('localhost');
-		$page->findById('server_port')->setValue(isset($parseURL['port']) ? $parseURL['port'] : 80);
-		$page->findById('script_path')->setValue($parseURL['path']);
-
-		// install/index.php?mode=install&sub=create_table
-		$page = self::click_submit();
-		self::assertContains('The database tables used by phpBB', $page->findById('main')->getText());
-		self::assertContains('have been created and populated with some initial data.', $page->findById('main')->getText());
-
-		// install/index.php?mode=install&sub=final
-		$page = self::click_submit();
-		self::assertContains('You have successfully installed', $page->getText());
-
-		copy($config_file, $config_file_test);
-
-		self::$session->stop();
-	}
-}