13 files changed, 299 insertions, 15 deletions
diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index 51f9daacfb..5832b966d8 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -415,4 +415,11 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 		$this->tools->sql_create_unique_index('prefix_table_name', 'i_uniq_ts_id', array('c_timestamp', 'c_id'));
 		$this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', 'i_uniq_ts_id'));
 	}
+
+	public function test_create_int_default_null()
+	{
+		$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_bug_13282'));
+		$this->assertTrue($this->tools->sql_column_add('prefix_table_name', 'c_bug_13282', array('TINT:2')));
+		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_bug_13282'));
+	}
 }
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php
index 10a9444d63..4c4306888c 100644
--- a/tests/dbal/migrator_test.php
+++ b/tests/dbal/migrator_test.php
@@ -46,7 +46,10 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 			new \phpbb\db\migration\tool\config($this->config),
 		);
 
+		$container = new phpbb_mock_container_builder();
+
 		$this->migrator = new \phpbb\db\migrator(
+			$container,
 			$this->config,
 			$this->db,
 			$this->db_tools,
@@ -57,9 +60,8 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 			$tools,
 			new \phpbb\db\migration\helper()
 		);
-
-		$container = new phpbb_mock_container_builder();
-		$container->set('migrator', $migrator);
+		$container->set('migrator', $this->migrator);
+		$container->set('dispatcher', new phpbb_mock_event_dispatcher());
 		$user = new \phpbb\user('\phpbb\datetime');
 
 		$this->extension_manager = new \phpbb\extension\manager(
diff --git a/tests/event/exception_listener_test.php b/tests/event/exception_listener_test.php
new file mode 100644
index 0000000000..4d3453cd83
--- /dev/null
+++ b/tests/event/exception_listener_test.php
@@ -0,0 +1,100 @@
+<?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/functions.php';
+
+class exception_listener extends phpbb_test_case
+{
+	public function phpbb_exception_data()
+	{
+		return array(
+			array(
+				true,
+				new \Exception(),
+				array(
+					'status_code' => 500,
+				),
+			),
+			array(
+				true,
+				new \Exception('AJAX_ERROR_TEXT'),
+				array(
+					'status_code' => 500,
+					'content' => 'AJAX_ERROR_TEXT',
+				),
+			),
+			array(
+				true,
+				new \phpbb\exception\runtime_exception('AJAX_ERROR_TEXT'),
+				array(
+					'status_code' => 500,
+					'content' => 'Something went wrong when processing your request.',
+				),
+			),
+			array(
+				true,
+				new \Symfony\Component\HttpKernel\Exception\HttpException(404, 'AJAX_ERROR_TEXT'),
+				array(
+					'status_code' => 404,
+					'content' => 'AJAX_ERROR_TEXT',
+				),
+			),
+			array(
+				true,
+				new \phpbb\exception\http_exception(404, 'AJAX_ERROR_TEXT'),
+				array(
+					'status_code' => 404,
+					'content' => 'Something went wrong when processing your request.',
+				),
+			),
+			array(
+				true,
+				new \phpbb\exception\http_exception(404, 'CURRENT_TIME', array('today')),
+				array(
+					'status_code' => 404,
+					'content' => 'It is currently today',
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider phpbb_exception_data
+	 */
+	public function test_phpbb_exception($is_ajax, $exception, $expected)
+	{
+		$request = \Symfony\Component\HttpFoundation\Request::create('test.php', 'GET', array(), array(), array(), $is_ajax ? array('HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest') : array());
+
+		$template = $this->getMockBuilder('\phpbb\template\twig\twig')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$user = new \phpbb\user('\phpbb\datetime');
+		$user->add_lang('common');
+
+		$exception_listener = new \phpbb\event\kernel_exception_subscriber($template, $user);
+
+		$event = new \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent($this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, \Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST, $exception);
+		$exception_listener->on_kernel_exception($event);
+
+		$response = $event->getResponse();
+
+		$this->assertEquals($expected['status_code'], $response->getStatusCode());
+		$this->assertEquals($is_ajax, $response instanceof \Symfony\Component\HttpFoundation\JsonResponse);
+
+		if (isset($expected['content']))
+		{
+			$this->assertContains($expected['content'], $response->getContent());
+		}
+	}
+}
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index 5c7cad89f6..0eeb060936 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -156,7 +156,10 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 		$table_prefix = 'phpbb_';
 		$user = new \phpbb\user('\phpbb\user');
 
+		$container = new phpbb_mock_container_builder();
+
 		$migrator = new \phpbb\db\migrator(
+			$container,
 			$config,
 			$db,
 			$db_tools,
@@ -167,7 +170,6 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 			array(),
 			new \phpbb\db\migration\helper()
 		);
-		$container = new phpbb_mock_container_builder();
 		$container->set('migrator', $migrator);
 
 		return new \phpbb\extension\manager(
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index fab1d3af3a..2a746d3792 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -62,7 +62,10 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 			new \phpbb\template\context()
 		);
 
+		$container = new phpbb_mock_container_builder();
+
 		$this->migrator = new \phpbb\db\migrator(
+			$container,
 			$this->config,
 			$this->db,
 			$this->db_tools,
@@ -73,7 +76,6 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 			array(),
 			new \phpbb\db\migration\helper()
 		);
-		$container = new phpbb_mock_container_builder();
 		$container->set('migrator', $this->migrator);
 
 		$this->extension_manager = new \phpbb\extension\manager(
diff --git a/tests/functional/acp_profile_field_test.php b/tests/functional/acp_profile_field_test.php
new file mode 100644
index 0000000000..88df782faa
--- /dev/null
+++ b/tests/functional/acp_profile_field_test.php
@@ -0,0 +1,71 @@
+<?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_profile_field_test extends phpbb_functional_test_case
+{
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->login();
+		$this->admin_login();
+		$this->add_lang('acp/profile');
+	}
+
+	public function data_add_profile_field()
+	{
+		return array(
+			array('bool', 'profilefields.type.bool',
+				array(
+					'lang_options[0]'	=> 'foo',
+					'lang_options[1]'	=> 'bar',
+				),
+				array(),
+			),
+			array('dropdown', 'profilefields.type.dropdown',
+				array(
+					'lang_options'	=> "foo\nbar\nbar\nfoo",
+				),
+				array(),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider data_add_profile_field
+	 */
+	public function test_add_profile_field($name, $type, $page1_settings, $page2_settings)
+	{
+		// Custom profile fields page
+		$crawler = self::request('GET', 'adm/index.php?i=acp_profile&mode=profile&sid=' . $this->sid);
+		// these language strings are html
+		$form = $crawler->selectButton('Create new field')->form(array(
+			'field_ident'	=> $name,
+			'field_type'	=> $type,
+		));
+		$crawler = self::submit($form);
+
+		// Fill form for profile field options
+		$form = $crawler->selectButton('Profile type specific options')->form($page1_settings);
+		$crawler = self::submit($form);
+
+		// Fill form for profile field specific options
+		$form = $crawler->selectButton('Save')->form($page2_settings);
+		$crawler= self::submit($form);
+
+		$this->assertContainsLang('ADDED_PROFILE_FIELD', $crawler->text());
+	}
+}
diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index b8c48389e0..d381fa1ae2 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php
@@ -93,23 +93,32 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 		$this->login();
 		$this->admin_login();
 		$this->add_lang('ucp');
-		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_attachments&mode=attach');
 
-		$form = $crawler->selectButton('Submit')->form();
-		$values = $form->getValues();
+		// Make sure check_attachment_content is set to false
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_attachments&mode=attach');
 
-		$values["config[check_attachment_content]"] = 0;
-		$form->setValues($values);
-		$crawler = self::submit($form);
+		$form = $crawler->selectButton('Submit')->form(array(
+			'config[check_attachment_content]'	=> 0,
+			'config[img_imagick]'				=> '',
+		));
+		self::submit($form);
 
 		// Request index for correct URL
-		$crawler = self::request('GET', 'index.php?sid=' . $this->sid);
+		self::request('GET', 'index.php?sid=' . $this->sid);
 
 		$crawler = $this->upload_file('disallowed.jpg', 'image/jpeg');
 
 		// Hitting the UNABLE_GET_IMAGE_SIZE error means we passed the
 		// DISALLOWED_CONTENT check
 		$this->assertContainsLang('UNABLE_GET_IMAGE_SIZE', $crawler->text());
+
+		// Reset check_attachment_content to default (enabled)
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_attachments&mode=attach');
+
+		$form = $crawler->selectButton('Submit')->form(array(
+			'config[check_attachment_content]'	=> 1,
+		));
+		self::submit($form);
 	}
 
 	public function test_too_large()
diff --git a/tests/functional/prune_shadow_topic_test.php b/tests/functional/prune_shadow_topic_test.php
index f00303060d..c014119b98 100644
--- a/tests/functional/prune_shadow_topic_test.php
+++ b/tests/functional/prune_shadow_topic_test.php
@@ -62,7 +62,7 @@ class phpbb_functional_prune_shadow_topic_test extends phpbb_functional_test_cas
 		$crawler = self::request('GET', "viewtopic.php?t={$this->post['topic_id']}&sid={$this->sid}");
 
 		$this->assertContains('Prune Shadow #1', $crawler->filter('html')->text());
-		$this->data['topics']['Prune Shadow #1'] = (int) $post['topic_id'];
+		$this->data['topics']['Prune Shadow #1'] = (int) $this->post['topic_id'];
 		$this->data['posts']['Prune Shadow #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p');
 
 		$this->assert_forum_details($this->data['forums']['Prune Shadow'], array(
diff --git a/tests/functions/get_remote_file_test.php b/tests/functions/get_remote_file_test.php
index d412dce164..612d82273e 100644
--- a/tests/functions/get_remote_file_test.php
+++ b/tests/functions/get_remote_file_test.php
@@ -21,6 +21,10 @@ class phpbb_functions_get_remote_file extends phpbb_test_case
 {
 	public function test_version_phpbb_com()
 	{
+		global $phpbb_container;
+		$phpbb_container = new phpbb_mock_container_builder();
+		$phpbb_container->set('file_downloader', new \phpbb\file_downloader());
+
 		$hostname = 'version.phpbb.com';
 
 		if (!phpbb_checkdnsrr($hostname, 'A'))
diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php
index bb68f8b3bc..73f0e6bafc 100644
--- a/tests/path_helper/path_helper_test.php
+++ b/tests/path_helper/path_helper_test.php
@@ -436,4 +436,29 @@ class phpbb_path_helper_test extends phpbb_test_case
 	{
 		$this->assertEquals($this->phpbb_root_path . $expected, $this->path_helper->get_web_root_path_from_ajax_referer($referer_url, $board_url));
 	}
+
+	public function data_get_valid_page()
+	{
+		return array(
+			// array( current page , mod_rewrite setting , expected output )
+			array('index', true, 'index'),
+			array('index', false, 'index'),
+			array('foo/index', true, 'foo/index'),
+			array('foo/index', false, 'foo/index'),
+			array('app.php/foo', true, 'foo'),
+			array('app.php/foo', false, 'app.php/foo'),
+			array('/../app.php/foo', true, '../foo'),
+			array('/../app.php/foo', false, '../app.php/foo'),
+			array('/../example/app.php/foo/bar', true, '../example/foo/bar'),
+			array('/../example/app.php/foo/bar', false, '../example/app.php/foo/bar'),
+		);
+	}
+
+	/**
+	 * @dataProvider data_get_valid_page
+	 */
+	public function test_get_valid_page($page, $mod_rewrite, $expected)
+	{
+		$this->assertEquals($this->phpbb_root_path . $expected, $this->path_helper->get_valid_page($page, $mod_rewrite));
+	}
 }
diff --git a/tests/search/fixtures/posts.xml b/tests/search/fixtures/posts.xml
index 7b249ee303..16232b8f39 100644
--- a/tests/search/fixtures/posts.xml
+++ b/tests/search/fixtures/posts.xml
@@ -19,6 +19,11 @@
 			<value>commonword</value>
 			<value>commonword</value>
 		</row>
+		<row>
+			<value>baaz</value>
+			<value>baaz</value>
+			<value>baaz</value>
+		</row>
 	</table>
 	<table name="phpbb_search_wordlist">
 		<column>word_id</column>
@@ -39,5 +44,10 @@
 			<value>commonword</value>
 			<value>1</value>
 		</row>
+		<row>
+			<value>4</value>
+			<value>baaz</value>
+			<value>0</value>
+		</row>
 	</table>
 </dataset>
diff --git a/tests/search/native_test.php b/tests/search/native_test.php
index f681a62fce..61fde7d098 100644
--- a/tests/search/native_test.php
+++ b/tests/search/native_test.php
@@ -35,6 +35,8 @@ class phpbb_search_native_test extends phpbb_search_test_case
 		$this->db = $this->new_dbal();
 		$error = null;
 		$class = self::get_search_wrapper('\phpbb\search\fulltext_native');
+		$config['fulltext_native_min_chars'] = 2;
+		$config['fulltext_native_max_chars'] = 14;
 		$this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user);
 	}
 
@@ -56,6 +58,54 @@ class phpbb_search_native_test extends phpbb_search_test_case
 				array(),
 			),
 			array(
+				'baaz*',
+				'all',
+				true,
+				array('\'baaz%\''),
+				array(),
+				array(),
+			),
+			array(
+				'ba*az',
+				'all',
+				true,
+				array('\'ba%az\''),
+				array(),
+				array(),
+			),
+			array(
+				'ba*z',
+				'all',
+				true,
+				array('\'ba%z\''),
+				array(),
+				array(),
+			),
+			array(
+				'baa* baaz*',
+				'all',
+				true,
+				array('\'baa%\'', '\'baaz%\''),
+				array(),
+				array(),
+			),
+			array(
+				'ba*z baa*',
+				'all',
+				true,
+				array('\'ba%z\'', '\'baa%\''),
+				array(),
+				array(),
+			),
+			array(
+				'baaz* commonword',
+				'all',
+				true,
+				array('\'baaz%\''),
+				array(),
+				array('commonword'),
+			),
+			array(
 				'foo bar',
 				'all',
 				true,
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 51bae7a723..b6769f08d0 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -227,7 +227,9 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$db = $this->get_db();
 		$db_tools = new \phpbb\db\tools($db);
 
+		$container = new phpbb_mock_container_builder();
 		$migrator = new \phpbb\db\migrator(
+			$container,
 			$config,
 			$db,
 			$db_tools,
@@ -238,8 +240,8 @@ class phpbb_functional_test_case extends phpbb_test_case
 			array(),
 			new \phpbb\db\migration\helper()
 		);
-		$container = new phpbb_mock_container_builder();
 		$container->set('migrator', $migrator);
+		$container->set('dispatcher', new phpbb_mock_event_dispatcher());
 		$user = new \phpbb\user('\phpbb\datetime');
 
 		$extension_manager = new \phpbb\extension\manager(
@@ -883,7 +885,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 	*/
 	static public function assert_response_status_code($status_code = 200)
 	{
-		self::assertEquals($status_code, self::$client->getResponse()->getStatus());
+		self::assertEquals($status_code, self::$client->getResponse()->getStatus(), 'HTTP status code does not match');
 	}
 
 	public function assert_filter($crawler, $expr, $msg = null)