Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786

3 files changed, 14 insertions, 33 deletions

diff --git a/tests/mock/auth_provider.php b/tests/mock/auth_provider.php
index 9d002334d6..a576ef6b67 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/extension_manager.php b/tests/mock/extension_manager.php
index 10b3595206..0d1b6940ca 100644
--- a/tests/mock/extension_manager.php
+++ b/tests/mock/extension_manager.php
@@ -14,6 +14,12 @@ class phpbb_mock_extension_manager extends phpbb_extension_manager
 		$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/request.php b/tests/mock/request.php
index 2a272fc03b..d671621460 100644
--- a/tests/mock/request.php
+++ b/tests/mock/request.php
@@ -74,6 +74,11 @@ class phpbb_mock_request implements phpbb_request_interface
 		return array_keys($this->data[$super_global]);
 	}
 
+	public function get_super_global($super_global = phpbb_request_interface::REQUEST)
+	{
+		return $this->data[$super_global];
+	}
+
 	/* custom methods */
 
 	public function set_header($header_name, $value)