23 files changed, 1057 insertions, 43 deletions
diff --git a/tests/mock/auth_provider.php b/tests/mock/auth_provider.php
new file mode 100644
index 0000000000..abf0e4fdfb
--- /dev/null
+++ b/tests/mock/auth_provider.php
@@ -0,0 +1,27 @@
+<?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.
+*
+*/
+
+/**
+ * Mock auth provider class with basic functions to help test sessions.
+ */
+class phpbb_mock_auth_provider extends \phpbb\auth\provider\base
+{
+	public function login($username, $password)
+	{
+		return array(
+			'status' => "",
+			'error_msg' => "",
+			'user_row' => "",
+		);
+	}
+}
diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index acf4288319..5fa3d28147 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -1,22 +1,23 @@
 <?php
 /**
 *
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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_mock_cache
+class phpbb_mock_cache implements \phpbb\cache\driver\driver_interface
 {
+	protected $data;
+
 	public function __construct($data = array())
 	{
 		$this->data = $data;
-
-		if (!isset($this->data['_bots']))
-		{
-			$this->data['_bots'] = array();
-		}
 	}
 
 	public function get($var_name)
@@ -34,24 +35,6 @@ class phpbb_mock_cache
 		$this->data[$var_name] = $var;
 	}
 
-	public function destroy($var_name, $table = '')
-	{
-		if ($table)
-		{
-			throw new Exception('Destroying tables is not implemented yet');
-		}
-
-		unset($this->data[$var_name]);
-	}
-
-	/**
-	* Obtain active bots
-	*/
-	public function obtain_bots()
-	{
-		return $this->data['_bots'];
-	}
-
 	/**
 	 * Obtain list of word censors. We don't need to parse them here,
 	 * that is tested elsewhere.
@@ -89,17 +72,32 @@ class phpbb_mock_cache
 		}
 	}
 
-	public function set_bots($bots)
+	public function checkVar(PHPUnit_Framework_Assert $test, $var_name, $data)
 	{
-		$this->data['_bots'] = $bots;
+		$test->assertTrue(isset($this->data[$var_name]));
+		$test->assertEquals($data, $this->data[$var_name]);
 	}
 
-	public function checkVar(PHPUnit_Framework_Assert $test, $var_name, $data)
+	public function checkAssociativeVar(PHPUnit_Framework_Assert $test, $var_name, $data, $sort = true)
 	{
 		$test->assertTrue(isset($this->data[$var_name]));
+
+		if ($sort)
+		{
+			foreach ($this->data[$var_name] as &$content)
+			{
+				sort($content);
+			}
+		}
+
 		$test->assertEquals($data, $this->data[$var_name]);
 	}
 
+	public function checkVarUnset(PHPUnit_Framework_Assert $test, $var_name)
+	{
+		$test->assertFalse(isset($this->data[$var_name]));
+	}
+
 	public function check(PHPUnit_Framework_Assert $test, $data, $ignore_db_info = true)
 	{
 		$cache_data = $this->data;
@@ -116,5 +114,58 @@ class phpbb_mock_cache
 
 		$test->assertEquals($data, $cache_data);
 	}
-}
 
+	function load()
+	{
+	}
+	function unload()
+	{
+	}
+	function save()
+	{
+	}
+	function tidy()
+	{
+	}
+	function purge()
+	{
+	}
+	function destroy($var_name, $table = '')
+	{
+		unset($this->data[$var_name]);
+	}
+	public function _exists($var_name)
+	{
+	}
+	public function sql_load($query)
+	{
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_save(\phpbb\db\driver\driver_interface $db, $query, $query_result, $ttl)
+	{
+		return $query_result;
+	}
+	public function sql_exists($query_id)
+	{
+	}
+	public function sql_fetchrow($query_id)
+	{
+	}
+	public function sql_fetchfield($query_id, $field)
+	{
+	}
+	public function sql_rowseek($rownum, $query_id)
+	{
+	}
+	public function sql_freeresult($query_id)
+	{
+	}
+
+	public function obtain_bots()
+	{
+		return isset($this->data['_bots']) ? $this->data['_bots'] : array();
+	}
+}
diff --git a/tests/mock/container_builder.php b/tests/mock/container_builder.php
new file mode 100644
index 0000000000..297e3a65e6
--- /dev/null
+++ b/tests/mock/container_builder.php
@@ -0,0 +1,183 @@
+<?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 Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\ScopeInterface;
+
+class phpbb_mock_container_builder implements ContainerInterface
+{
+	protected $services = array();
+	protected $parameters = array();
+
+	/**
+	* Sets a service.
+	*
+	* @param string $id      The service identifier
+	* @param object $service The service instance
+	* @param string $scope   The scope of the service
+	*
+	* @api
+	*/
+	public function set($id, $service, $scope = self::SCOPE_CONTAINER)
+	{
+		$this->services[$id] = $service;
+	}
+
+	/**
+	* Gets a service.
+	*
+	* @param string $id              The service identifier
+	* @param int    $invalidBehavior The behavior when the service does not exist
+	*
+	* @return object The associated service
+	*
+	* @throws InvalidArgumentException if the service is not defined
+	* @throws ServiceCircularReferenceException When a circular reference is detected
+	* @throws ServiceNotFoundException When the service is not defined
+	*
+	* @see Reference
+	*
+	* @api
+	*/
+	public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE)
+	{
+		if ($this->has($id))
+		{
+			return $this->services[$id];
+		}
+
+		throw new Exception('Could not find service: ' . $id);
+	}
+
+	/**
+	* Returns true if the given service is defined.
+	*
+	* @param string $id The service identifier
+	*
+	* @return Boolean true if the service is defined, false otherwise
+	*
+	* @api
+	*/
+	public function has($id)
+	{
+		return isset($this->services[$id]);
+	}
+
+	/**
+	* Gets a parameter.
+	*
+	* @param string $name The parameter name
+	*
+	* @return mixed  The parameter value
+	*
+	* @throws InvalidArgumentException if the parameter is not defined
+	*
+	* @api
+	*/
+	public function getParameter($name)
+	{
+		if ($this->hasParameter($name))
+		{
+			return $this->parameters[$name];
+		}
+
+		throw new Exception('Could not find parameter: ' . $name);
+	}
+
+	/**
+	* Checks if a parameter exists.
+	*
+	* @param string $name The parameter name
+	*
+	* @return Boolean The presence of parameter in container
+	*
+	* @api
+	*/
+	public function hasParameter($name)
+	{
+		return isset($this->parameters[$name]);
+	}
+
+	/**
+	* Sets a parameter.
+	*
+	* @param string $name  The parameter name
+	* @param mixed  $value The parameter value
+	*
+	* @api
+	*/
+	public function setParameter($name, $value)
+	{
+		$this->parameters[$name] = $value;
+	}
+
+	/**
+	* Enters the given scope
+	*
+	* @param string $name
+	*
+	* @api
+	*/
+	public function enterScope($name)
+	{
+	}
+
+	/**
+	* Leaves the current scope, and re-enters the parent scope
+	*
+	* @param string $name
+	*
+	* @api
+	*/
+	public function leaveScope($name)
+	{
+	}
+
+	/**
+	* Adds a scope to the container
+	*
+	* @param ScopeInterface $scope
+	*
+	* @api
+	*/
+	public function addScope(ScopeInterface $scope)
+	{
+	}
+
+	/**
+	* Whether this container has the given scope
+	*
+	* @param string $name
+	*
+	* @return Boolean
+	*
+	* @api
+	*/
+	public function hasScope($name)
+	{
+	}
+
+	/**
+	* Determines whether the given scope is currently active.
+	*
+	* It does however not check if the scope actually exists.
+	*
+	* @param string $name
+	*
+	* @return Boolean
+	*
+	* @api
+	*/
+	public function isScopeActive($name)
+	{
+	}
+}
diff --git a/tests/mock/controller_helper.php b/tests/mock/controller_helper.php
new file mode 100644
index 0000000000..ae3e7bf432
--- /dev/null
+++ b/tests/mock/controller_helper.php
@@ -0,0 +1,34 @@
+<?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_mock_controller_helper extends \phpbb\controller\helper
+{
+	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, \phpbb\symfony_request $symfony_request, \phpbb\request\request_interface $request, \phpbb\filesystem $filesystem, $phpbb_root_path, $php_ext, $phpbb_root_path_ext)
+	{
+		$this->template = $template;
+		$this->user = $user;
+		$this->config = $config;
+		$this->symfony_request = $symfony_request;
+		$this->request = $request;
+		$this->filesystem = $filesystem;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+		$provider->find_routing_files($manager->get_finder());
+		$this->route_collection = $provider->find($phpbb_root_path_ext)->get_routes();
+	}
+
+	public function get_current_url()
+	{
+		return '';
+	}
+}
diff --git a/tests/mock/event_dispatcher.php b/tests/mock/event_dispatcher.php
new file mode 100644
index 0000000000..fa8b4a1036
--- /dev/null
+++ b/tests/mock/event_dispatcher.php
@@ -0,0 +1,29 @@
+<?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_mock_event_dispatcher extends \phpbb\event\dispatcher
+{
+	/**
+	* Constructor.
+	*
+	* Overwrite the constructor to get rid of ContainerInterface param instance
+	*/
+	public function __construct()
+	{
+	}
+
+	public function trigger_event($eventName, $data = array())
+	{
+		return array();
+	}
+}
diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php
new file mode 100644
index 0000000000..3b759fbbc2
--- /dev/null
+++ b/tests/mock/extension_manager.php
@@ -0,0 +1,24 @@
+<?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_mock_extension_manager extends \phpbb\extension\manager
+{
+	public function __construct($phpbb_root_path, $extensions = array(), $container = null)
+	{
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = 'php';
+		$this->extensions = $extensions;
+		$this->filesystem = new \phpbb\filesystem();
+		$this->container = $container;
+	}
+}
diff --git a/tests/mock/file_downloader.php b/tests/mock/file_downloader.php
new file mode 100644
index 0000000000..d8951cebf6
--- /dev/null
+++ b/tests/mock/file_downloader.php
@@ -0,0 +1,27 @@
+<?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_mock_file_downloader extends \phpbb\file_downloader
+{
+	public $data;
+
+	public function set($data)
+	{
+		$this->data = $data;
+	}
+
+	public function get($host, $directory, $filename, $port = 80, $timeout = 6)
+	{
+		return $this->data;
+	}
+}
diff --git a/tests/mock/filespec.php b/tests/mock/filespec.php
new file mode 100644
index 0000000000..7ea750afbe
--- /dev/null
+++ b/tests/mock/filespec.php
@@ -0,0 +1,36 @@
+<?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.
+*
+*/
+
+/**
+ * Mock filespec class with some basic values to help with testing the
+ * fileupload class
+ */
+class phpbb_mock_filespec
+{
+	public $filesize;
+	public $realname;
+	public $extension;
+	public $width;
+	public $height;
+	public $error = array();
+
+	public function check_content($disallowed_content)
+	{
+		return true;
+	}
+
+	public function get($property)
+	{
+		return $this->$property;
+	}
+}
diff --git a/tests/mock/filesystem_extension_manager.php b/tests/mock/filesystem_extension_manager.php
new file mode 100644
index 0000000000..fa1b1c06bc
--- /dev/null
+++ b/tests/mock/filesystem_extension_manager.php
@@ -0,0 +1,36 @@
+<?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_mock_filesystem_extension_manager extends phpbb_mock_extension_manager
+{
+	public function __construct($phpbb_root_path)
+	{
+		$extensions = array();
+		$iterator = new DirectoryIterator($phpbb_root_path . 'ext/');
+		foreach ($iterator as $fileinfo)
+		{
+			if ($fileinfo->isDir() && substr($fileinfo->getFilename(), 0, 1) != '.')
+			{
+				$name = $fileinfo->getFilename();
+				$extension = array(
+					'ext_name' => $name,
+					'ext_active' => true,
+					'ext_path' => 'ext/' . $name . '/',
+				);
+				$extensions[$name] = $extension;
+			}
+		}
+		ksort($extensions);
+		parent::__construct($phpbb_root_path, $extensions);
+	}
+}
diff --git a/tests/mock/fileupload.php b/tests/mock/fileupload.php
new file mode 100644
index 0000000000..8cc4d77ea1
--- /dev/null
+++ b/tests/mock/fileupload.php
@@ -0,0 +1,27 @@
+<?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.
+*
+*/
+
+/**
+ * Mock fileupload class with some basic values to help with testing the
+ * filespec class
+ */
+class phpbb_mock_fileupload
+{
+	public $max_filesize = 100;
+	public $error_prefix = '';
+
+	public function valid_dimensions($filespec)
+	{
+		return true;
+	}
+}
diff --git a/tests/mock/lang.php b/tests/mock/lang.php
new file mode 100644
index 0000000000..bebbe5a29b
--- /dev/null
+++ b/tests/mock/lang.php
@@ -0,0 +1,42 @@
+<?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.
+*
+*/
+
+/**
+* phpbb_mock_lang
+* mock a user with some language-keys specified
+*/
+class phpbb_mock_lang implements ArrayAccess
+{
+	public function offsetExists($offset)
+	{
+		return true;
+	}
+
+	public function offsetGet($offset)
+	{
+		return $offset;
+	}
+
+	public function offsetSet($offset, $value)
+	{
+	}
+
+	public function offsetUnset($offset)
+	{
+	}
+
+	public function lang()
+	{
+		return implode(' ', func_get_args());
+	}
+}
diff --git a/tests/mock/metadata_manager.php b/tests/mock/metadata_manager.php
new file mode 100644
index 0000000000..2443fad560
--- /dev/null
+++ b/tests/mock/metadata_manager.php
@@ -0,0 +1,27 @@
+<?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_mock_metadata_manager extends \phpbb\extension\metadata_manager
+{
+	public function set_metadata($metadata)
+	{
+		array_walk_recursive($metadata, array($this, 'sanitize_json'));
+		$this->metadata = $metadata;
+	}
+
+	public function merge_metadata($metadata)
+	{
+		array_walk_recursive($metadata, array($this, 'sanitize_json'));
+		$this->metadata = array_merge($this->metadata, $metadata);
+	}
+}
diff --git a/tests/mock/migrator.php b/tests/mock/migrator.php
new file mode 100644
index 0000000000..293f115335
--- /dev/null
+++ b/tests/mock/migrator.php
@@ -0,0 +1,55 @@
+<?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_mock_migrator extends \phpbb\db\migrator
+{
+	public function __construct()
+	{
+	}
+
+	public function load_migration_state()
+	{
+	}
+
+	public function set_migrations($class_names)
+	{
+	}
+
+	public function update()
+	{
+	}
+
+	public function revert($migration)
+	{
+	}
+
+	public function unfulfillable($name)
+	{
+	}
+
+	public function finished()
+	{
+	}
+
+	public function migration_state($migration)
+	{
+	}
+
+	public function populate_migrations($migrations)
+	{
+	}
+
+	public function create_migrations_table()
+	{
+	}
+}
diff --git a/tests/mock/notification_manager.php b/tests/mock/notification_manager.php
new file mode 100644
index 0000000000..6a590bc0ca
--- /dev/null
+++ b/tests/mock/notification_manager.php
@@ -0,0 +1,97 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Notifications service class
+*/
+class phpbb_mock_notification_manager
+{
+	public function load_notifications()
+	{
+		return array(
+			'notifications'		=> array(),
+			'unread_count'		=> 0,
+		);
+	}
+
+	public function mark_notifications_read()
+	{
+	}
+
+	public function mark_notifications_read_by_parent()
+	{
+	}
+
+	public function mark_notifications_read_by_id()
+	{
+	}
+
+
+	public function add_notifications()
+	{
+		return array();
+	}
+
+	public function add_notifications_for_users()
+	{
+	}
+
+	public function update_notifications()
+	{
+	}
+
+	public function delete_notifications()
+	{
+	}
+
+	public function get_subscription_types()
+	{
+		return array();
+	}
+
+	public function get_subscription_methods()
+	{
+		return array();
+	}
+
+
+	public function get_global_subscriptions()
+	{
+		return array();
+	}
+
+	public function add_subscription()
+	{
+	}
+
+	public function delete_subscription()
+	{
+	}
+
+	public function load_users()
+	{
+	}
+
+	public function get_user()
+	{
+		return null;
+	}
+}
diff --git a/tests/mock/notification_type_post.php b/tests/mock/notification_type_post.php
new file mode 100644
index 0000000000..6d8f6dc504
--- /dev/null
+++ b/tests/mock/notification_type_post.php
@@ -0,0 +1,40 @@
+<?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.
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_mock_notification_type_post extends \phpbb\notification\type\post
+{
+	public function __construct($user_loader, $db, $cache, $user, $auth, $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
+	{
+		$this->user_loader = $user_loader;
+		$this->db = $db;
+		$this->cache = $cache;
+		$this->user = $user;
+		$this->auth = $auth;
+		$this->config = $config;
+
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+
+		$this->notification_types_table = $notification_types_table;
+		$this->notifications_table = $notifications_table;
+		$this->user_notifications_table = $user_notifications_table;	
+	}
+}
diff --git a/tests/mock/notifications_auth.php b/tests/mock/notifications_auth.php
new file mode 100644
index 0000000000..1106c3004f
--- /dev/null
+++ b/tests/mock/notifications_auth.php
@@ -0,0 +1,44 @@
+<?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_mock_notifications_auth extends \phpbb\auth\auth
+{
+	function acl_get_list($user_id = false, $opts = false, $forum_id = false)
+	{
+		$user_id = (!is_array($user_id)) ? array($user_id) : $user_id;
+		$opts = (!is_array($opts)) ? array($opts) : $opts;
+		$forum_id = (!is_array($forum_id)) ? array($forum_id) : $forum_id;
+
+		$auth_list = array();
+
+		foreach ($forum_id as $fid)
+		{
+			foreach ($opts as $opt)
+			{
+				$auth_list[$fid][$opt] = array();
+
+				foreach ($user_id as $uid)
+				{
+					$auth_list[$fid][$opt][] = $uid;
+				}
+			}
+		}
+
+		return $auth_list;
+	}
+
+	function acl_get($opt, $f = 0)
+	{
+		return true;
+	}
+}
diff --git a/tests/mock/null_cache.php b/tests/mock/null_cache.php
index aca20ca77b..5b801adf11 100644
--- a/tests/mock/null_cache.php
+++ b/tests/mock/null_cache.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package testing
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -39,4 +43,9 @@ class phpbb_mock_null_cache
 	public function set_bots($bots)
 	{
 	}
+
+	public function sql_exists($query_id)
+	{
+		return false;
+	}
 }
diff --git a/tests/mock/phpbb_di_container_builder.php b/tests/mock/phpbb_di_container_builder.php
new file mode 100644
index 0000000000..59cdf0bb2b
--- /dev/null
+++ b/tests/mock/phpbb_di_container_builder.php
@@ -0,0 +1,20 @@
+<?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_mock_phpbb_di_container_builder extends \phpbb\di\container_builder
+{
+	protected function get_container_filename()
+	{
+		return $this->phpbb_root_path . '../../tmp/container.' . $this->php_ext;
+	}
+}
diff --git a/tests/mock/request.php b/tests/mock/request.php
new file mode 100644
index 0000000000..e7217a94a9
--- /dev/null
+++ b/tests/mock/request.php
@@ -0,0 +1,138 @@
+<?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_mock_request implements \phpbb\request\request_interface
+{
+	protected $data;
+
+	protected $super_globals_disabled = false;
+
+	public function __construct($get = array(), $post = array(), $cookie = array(), $server = array(), $request = false, $files = array())
+	{
+		$this->data[\phpbb\request\request_interface::GET] = $get;
+		$this->data[\phpbb\request\request_interface::POST] = $post;
+		$this->data[\phpbb\request\request_interface::COOKIE] = $cookie;
+		$this->data[\phpbb\request\request_interface::REQUEST] = ($request === false) ? $post + $get : $request;
+		$this->data[\phpbb\request\request_interface::SERVER] = $server;
+		$this->data[\phpbb\request\request_interface::FILES] = $files;
+
+		$this->disable_super_globals();
+	}
+
+	public function overwrite($var_name, $value, $super_global = \phpbb\request\request_interface::REQUEST)
+	{
+		$this->data[$super_global][$var_name] = $value;
+	}
+
+	public function variable($var_name, $default, $multibyte = false, $super_global = \phpbb\request\request_interface::REQUEST)
+	{
+		return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default;
+	}
+
+	public function server($var_name, $default = '')
+	{
+		$super_global = \phpbb\request\request_interface::SERVER;
+		return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default;
+	}
+
+	public function header($header_name, $default = '')
+	{
+		$var_name = 'HTTP_' . str_replace('-', '_', strtoupper($header_name));
+		return $this->server($var_name, $default);
+	}
+
+	public function file($form_name)
+	{
+		$super_global = \phpbb\request\request_interface::FILES;
+		return isset($this->data[$super_global][$form_name]) ? $this->data[$super_global][$form_name] : array();
+	}
+
+	public function is_set_post($name)
+	{
+		return $this->is_set($name, \phpbb\request\request_interface::POST);
+	}
+
+	public function is_set($var, $super_global = \phpbb\request\request_interface::REQUEST)
+	{
+		return isset($this->data[$super_global][$var]);
+	}
+
+	public function is_ajax()
+	{
+		return false;
+	}
+
+	public function is_secure()
+	{
+		return false;
+	}
+
+	public function variable_names($super_global = \phpbb\request\request_interface::REQUEST)
+	{
+		return array_keys($this->data[$super_global]);
+	}
+
+	public function get_super_global($super_global = \phpbb\request\request_interface::REQUEST)
+	{
+		return $this->data[$super_global];
+	}
+
+	public function super_globals_disabled()
+	{
+		return $this->super_globals_disabled;
+	}
+
+	public function disable_super_globals()
+	{
+		$this->super_globals_disabled = true;
+	}
+
+	public function enable_super_globals()
+	{
+		$this->super_globals_disabled = false;
+	}
+
+	/* custom methods */
+
+	public function set_header($header_name, $value)
+	{
+		$var_name = 'HTTP_' . str_replace('-', '_', strtoupper($header_name));
+		$this->data[\phpbb\request\request_interface::SERVER][$var_name] = $value;
+	}
+
+	public function merge($super_global = \phpbb\request\request_interface::REQUEST, $values)
+	{
+		$this->data[$super_global] = array_merge($this->data[$super_global], $values);
+	}
+
+	public function escape($var, $multibyte)
+	{
+		$type_cast_helper = new \phpbb\request\type_cast_helper();
+		if (is_array($var))
+		{
+			$result = array();
+			foreach ($var as $key => $value)
+			{
+				$type_cast_helper->set_var($key, $key, gettype($key), $multibyte);
+				$result[$key] = $this->escape($value, $multibyte);
+			}
+			$var = $result;
+		}
+		else
+		{
+			$type_cast_helper->set_var($var, $var, 'string', $multibyte);
+		}
+
+		return $var;
+	}
+}
diff --git a/tests/mock/search.php b/tests/mock/search.php
new file mode 100644
index 0000000000..f30876b4da
--- /dev/null
+++ b/tests/mock/search.php
@@ -0,0 +1,27 @@
+<?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_mock_search
+{
+
+	public function __construct($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user)
+	{
+	}
+
+	public function index_remove($post_ids, $poster_ids, $forum_ids)
+	{
+	}
+}
+
diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php
index 70a58fb6cc..29dd2a5bff 100644
--- a/tests/mock/session_testable.php
+++ b/tests/mock/session_testable.php
@@ -1,14 +1,17 @@
 <?php
 /**
 *
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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';
-require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
 
 /**
 * Extends the session class to overwrite the setting of cookies.
@@ -17,11 +20,11 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
 * test it without warnings about sent headers. This class only stores cookie
 * data for later verification.
 */
-class phpbb_mock_session_testable extends session
+class phpbb_mock_session_testable extends \phpbb\session
 {
 	private $_cookies = array();
 
-	public function set_cookie($name, $data, $time)
+	public function set_cookie($name, $data, $time, $httponly = true)
 	{
 		$this->_cookies[$name] = array($data, $time);
 	}
@@ -59,5 +62,9 @@ class phpbb_mock_session_testable extends session
 			}
 		}
 	}
+
+	public function setup()
+	{
+	}
 }
 
diff --git a/tests/mock/sql_insert_buffer.php b/tests/mock/sql_insert_buffer.php
new file mode 100644
index 0000000000..c751764d45
--- /dev/null
+++ b/tests/mock/sql_insert_buffer.php
@@ -0,0 +1,25 @@
+<?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_mock_sql_insert_buffer extends \phpbb\db\sql_insert_buffer
+{
+	public function flush()
+	{
+		return (sizeof($this->buffer)) ? true : false;
+	}
+
+	public function get_buffer()
+	{
+		return $this->buffer;
+	}
+}
diff --git a/tests/mock/user.php b/tests/mock/user.php
index bd547b3973..9888337a9e 100644
--- a/tests/mock/user.php
+++ b/tests/mock/user.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package testing
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* 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.
 *
 */
 
@@ -46,4 +50,9 @@ class phpbb_mock_user
 		}
 		return false;
 	}
+
+	public function lang()
+	{
+		return implode(' ', func_get_args());
+	}
 }