8 files changed, 37 insertions, 56 deletions
diff --git a/tests/mock/auth_provider.php b/tests/mock/auth_provider.php
index 9d002334d6..734e682ee9 100644
--- a/tests/mock/auth_provider.php
+++ b/tests/mock/auth_provider.php
@@ -10,14 +10,9 @@
 /**
  * Mock auth provider class with basic functions to help test sessions.
  */
-class phpbb_mock_auth_provider implements phpbb_auth_provider_interface
+class phpbb_mock_auth_provider extends \phpbb\auth\provider\base
 {
-	function init()
-	{
-		return null;
-	}
-
-	function login($username, $password)
+	public function login($username, $password)
 	{
 		return array(
 			'status' => "",
@@ -25,29 +20,4 @@ class phpbb_mock_auth_provider implements phpbb_auth_provider_interface
 			'user_row' => "",
 		);
 	}
-
-	function autologin()
-	{
-		return array();
-	}
-
-	function acp()
-	{
-		return array();
-	}
-
-	function logout($data, $new_session)
-	{
-		return null;
-	}
-
-	function validate_session($user)
-	{
-		return null;
-	}
-
-	public function get_acp_template($new_config)
-	{
-		return null;
-	}
 }
diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index 440592665a..83bbb8ef30 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -7,7 +7,7 @@
 *
 */
 
-class phpbb_mock_cache implements phpbb_cache_driver_interface
+class phpbb_mock_cache implements \phpbb\cache\driver\driver_interface
 {
 	protected $data;
 
@@ -140,7 +140,7 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface
 	/**
 	* {@inheritDoc}
 	*/
-	public function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl)
+	public function sql_save(\phpbb\db\driver\driver $db, $query, $query_result, $ttl)
 	{
 		return $query_result;
 	}
diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php
index 10b3595206..0c6b8447f1 100644
--- a/tests/mock/extension_manager.php
+++ b/tests/mock/extension_manager.php
@@ -7,13 +7,19 @@
 *
 */
 
-class phpbb_mock_extension_manager extends phpbb_extension_manager
+class phpbb_mock_extension_manager extends \phpbb\extension\manager
 {
 	public function __construct($phpbb_root_path, $extensions = array())
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = 'php';
 		$this->extensions = $extensions;
-		$this->filesystem = new phpbb_filesystem();
+		$this->filesystem = new \phpbb\filesystem(
+			new \phpbb\symfony_request(
+				new phpbb_mock_request()
+			),
+			$this->phpbb_root_path,
+			$this->php_ext
+		);
 	}
 }
diff --git a/tests/mock/metadata_manager.php b/tests/mock/metadata_manager.php
index a7fbf0681c..b6489acfa4 100644
--- a/tests/mock/metadata_manager.php
+++ b/tests/mock/metadata_manager.php
@@ -7,7 +7,7 @@
 *
 */
 
-class phpbb_mock_metadata_manager extends phpbb_extension_metadata_manager
+class phpbb_mock_metadata_manager extends \phpbb\extension\metadata_manager
 {
 	public function set_metadata($metadata)
 	{
diff --git a/tests/mock/notifications_auth.php b/tests/mock/notifications_auth.php
index d960acb81a..2d387d8c00 100644
--- a/tests/mock/notifications_auth.php
+++ b/tests/mock/notifications_auth.php
@@ -7,7 +7,7 @@
 *
 */
 
-class phpbb_mock_notifications_auth extends phpbb_auth
+class phpbb_mock_notifications_auth extends \phpbb\auth\auth
 {
 	function acl_get_list($user_id = false, $opts = false, $forum_id = false)
 	{
diff --git a/tests/mock/request.php b/tests/mock/request.php
index 2a272fc03b..60ba725abd 100644
--- a/tests/mock/request.php
+++ b/tests/mock/request.php
@@ -7,33 +7,33 @@
 *
 */
 
-class phpbb_mock_request implements phpbb_request_interface
+class phpbb_mock_request implements \phpbb\request\request_interface
 {
 	protected $data;
 
 	public function __construct($get = array(), $post = array(), $cookie = array(), $server = array(), $request = false, $files = array())
 	{
-		$this->data[phpbb_request_interface::GET] = $get;
-		$this->data[phpbb_request_interface::POST] = $post;
-		$this->data[phpbb_request_interface::COOKIE] = $cookie;
-		$this->data[phpbb_request_interface::REQUEST] = ($request === false) ? $post + $get : $request;
-		$this->data[phpbb_request_interface::SERVER] = $server;
-		$this->data[phpbb_request_interface::FILES] = $files;
+		$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;
 	}
 
-	public function overwrite($var_name, $value, $super_global = phpbb_request_interface::REQUEST)
+	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_interface::REQUEST)
+	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_interface::SERVER;
+		$super_global = \phpbb\request\request_interface::SERVER;
 		return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default;
 	}
 
@@ -45,16 +45,16 @@ class phpbb_mock_request implements phpbb_request_interface
 
 	public function file($form_name)
 	{
-		$super_global = phpbb_request_interface::FILES;
+		$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_interface::POST);
+		return $this->is_set($name, \phpbb\request\request_interface::POST);
 	}
 
-	public function is_set($var, $super_global = phpbb_request_interface::REQUEST)
+	public function is_set($var, $super_global = \phpbb\request\request_interface::REQUEST)
 	{
 		return isset($this->data[$super_global][$var]);
 	}
@@ -69,20 +69,25 @@ class phpbb_mock_request implements phpbb_request_interface
 		return false;
 	}
 
-	public function variable_names($super_global = phpbb_request_interface::REQUEST)
+	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];
+	}
+
 	/* custom methods */
 
 	public function set_header($header_name, $value)
 	{
 		$var_name = 'HTTP_' . str_replace('-', '_', strtoupper($header_name));
-		$this->data[phpbb_request_interface::SERVER][$var_name] = $value;
+		$this->data[\phpbb\request\request_interface::SERVER][$var_name] = $value;
 	}
 
-	public function merge($super_global = phpbb_request_interface::REQUEST, $values)
+	public function merge($super_global = \phpbb\request\request_interface::REQUEST, $values)
 	{
 		$this->data[$super_global] = array_merge($this->data[$super_global], $values);
 	}
diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php
index 283f9af192..d81ae3163e 100644
--- a/tests/mock/session_testable.php
+++ b/tests/mock/session_testable.php
@@ -16,7 +16,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 * test it without warnings about sent headers. This class only stores cookie
 * data for later verification.
 */
-class phpbb_mock_session_testable extends phpbb_session
+class phpbb_mock_session_testable extends \phpbb\session
 {
 	private $_cookies = array();
 
diff --git a/tests/mock/sql_insert_buffer.php b/tests/mock/sql_insert_buffer.php
index ba09aa8d7f..aa7c54dddd 100644
--- a/tests/mock/sql_insert_buffer.php
+++ b/tests/mock/sql_insert_buffer.php
@@ -7,7 +7,7 @@
 *
 */
 
-class phpbb_mock_sql_insert_buffer extends phpbb_db_sql_insert_buffer
+class phpbb_mock_sql_insert_buffer extends \phpbb\db\sql_insert_buffer
 {
 	public function flush()
 	{