5 files changed, 15 insertions, 68 deletions
diff --git a/tests/functions/build_url_test.php b/tests/functions/build_url_test.php
index a59b94c744..3e19b51f02 100644
--- a/tests/functions/build_url_test.php
+++ b/tests/functions/build_url_test.php
@@ -29,7 +29,7 @@ class phpbb_build_url_test extends phpbb_test_case
 			new \phpbb\symfony_request(
 				new phpbb_mock_request()
 			),
-			new \phpbb\filesystem(),
+			new \phpbb\filesystem\filesystem(),
 			$this->getMock('\phpbb\request\request'),
 			$phpbb_root_path,
 			'php'
diff --git a/tests/functions/generate_string_list.php b/tests/functions/generate_string_list.php
index cd1e37618a..bcf0c09fe4 100644
--- a/tests/functions/generate_string_list.php
+++ b/tests/functions/generate_string_list.php
@@ -22,7 +22,12 @@ class phpbb_generate_string_list_test extends phpbb_test_case
 	{
 		parent::setUp();
 
-		$this->user = new \phpbb\user('\phpbb\datetime');
+		global $phpbb_root_path, $phpEx;
+
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
+		$this->user = $user;
 		$this->user->data = array('user_lang' => 'en');
 		$this->user->add_lang('common');
 	}
@@ -36,7 +41,7 @@ class phpbb_generate_string_list_test extends phpbb_test_case
 			),
 			array(
 				array('A'),
-				'A',	
+				'A',
 			),
 			array(
 				array(2 => 'A', 3 => 'B'),
diff --git a/tests/functions/get_remote_file_test.php b/tests/functions/get_remote_file_test.php
index 612d82273e..781a73a462 100644
--- a/tests/functions/get_remote_file_test.php
+++ b/tests/functions/get_remote_file_test.php
@@ -12,7 +12,7 @@
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_compatibility.php';
 
 /**
 * @group slow
diff --git a/tests/functions/is_absolute_test.php b/tests/functions/is_absolute_test.php
deleted file mode 100644
index afa4b9b59f..0000000000
--- a/tests/functions/is_absolute_test.php
+++ /dev/null
@@ -1,60 +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.
-*
-*/
-
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-
-class phpbb_functions_is_absolute_test extends phpbb_test_case
-{
-	static public function is_absolute_data()
-	{
-		return array(
-			// Empty
-			array('', false),
-
-			// Absolute unix style
-			array('/etc/phpbb', true),
-			// Unix does not support \ so that is not an absolute path
-			array('\etc\phpbb', false),
-
-			// Absolute windows style
-			array('c:\windows', true),
-			array('C:\Windows', true),
-			array('c:/windows', true),
-			array('C:/Windows', true),
-
-			// Executable
-			array('etc/phpbb', false),
-			array('explorer.exe', false),
-
-			// Relative subdir
-			array('Windows\System32', false),
-			array('Windows\System32\explorer.exe', false),
-			array('Windows/System32', false),
-			array('Windows/System32/explorer.exe', false),
-
-			// Relative updir
-			array('..\Windows\System32', false),
-			array('..\Windows\System32\explorer.exe', false),
-			array('../Windows/System32', false),
-			array('../Windows/System32/explorer.exe', false),
-		);
-	}
-
-	/**
-	* @dataProvider is_absolute_data
-	*/
-	public function test_is_absolute($path, $expected)
-	{
-		$this->assertEquals($expected, phpbb_is_absolute($path));
-	}
-}
diff --git a/tests/functions/user_delete_test.php b/tests/functions/user_delete_test.php
index db52dcded7..bd6b53c59f 100644
--- a/tests/functions/user_delete_test.php
+++ b/tests/functions/user_delete_test.php
@@ -28,10 +28,12 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case
 	{
 		parent::setUp();
 
-		global $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $user;
+		global $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $user, $phpbb_root_path, $phpEx;
 
 		$this->db = $db = $this->new_dbal();
-		$user = new \phpbb\user('\phpbb\datetime');
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$phpbb_container = new phpbb_mock_container_builder();
 		$config = new \phpbb\config\config(array(
@@ -39,8 +41,7 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case
 			'auth_oauth_google_key'	=> 'foo',
 			'auth_oauth_google_secret'	=> 'bar',
 		));
-		set_config_count('foobar', 0, false, $config);
-		$cache = new \phpbb\cache\driver\null();
+		$cache = new \phpbb\cache\driver\dummy();
 		$request = new phpbb_mock_request();
 		$notification_manager = new phpbb_mock_notification_manager();
 		$provider_collection =  new \phpbb\auth\provider_collection($phpbb_container, $config);
@@ -67,6 +68,7 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case
 			$request,
 			$user,
 			'phpbb_oauth_tokens',
+			'phpbb_oauth_states',
 			'phpbb_oauth_accounts',
 			$oauth_provider_collection,
 			'phpbb_users',