3 files changed, 15 insertions, 26 deletions
diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php
index 7301297096..ae4de26df4 100644
--- a/tests/functional/fileupload_remote_test.php
+++ b/tests/functional/fileupload_remote_test.php
@@ -32,8 +32,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
 		// URL
 
 		// Global $config required by unique_id
-		// Global $user required by fileupload::remote_upload
-		global $config, $user, $phpbb_root_path, $phpEx;
+		global $config, $phpbb_root_path, $phpEx;
 
 		if (!is_array($config))
 		{
@@ -43,16 +42,13 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
 		$config['rand_seed'] = '';
 		$config['rand_seed_last_update'] = time() + 600;
 
-		$user = new phpbb_mock_user();
-		$user->lang = new phpbb_mock_lang();
 		$this->filesystem = new \phpbb\filesystem\filesystem();
+		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 
 		$container = new phpbb_mock_container_builder();
-		$container->set('files.filespec', new \phpbb\files\filespec($this->filesystem));
+		$container->set('files.filespec', new \phpbb\files\filespec($this->filesystem, $this->language));
 		$this->factory = new \phpbb\files\factory($container);
 		$container->set('files.factory', $this->factory);
-
-		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 	}
 
 	public function tearDown()
diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 10577ec8f3..b28adc3f28 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -25,12 +25,13 @@ class phpbb_filespec_test extends phpbb_test_case
 	private $filesystem;
 	public $path;
 
+	/** @var \phpbb\language\language */
+	protected $language;
+
 	protected function setUp()
 	{
 		// Global $config required by unique_id
-		// Global $user required by filespec::additional_checks and
-		// filespec::move_file
-		global $config, $user, $phpbb_filesystem;
+		global $config, $phpbb_root_path, $phpEx;
 
 		if (!is_array($config))
 		{
@@ -44,9 +45,6 @@ class phpbb_filespec_test extends phpbb_test_case
 		// See: phpBB/install/schemas/schema_data.sql
 		$config['mime_triggers'] = 'body|head|html|img|plaintext|a href|pre|script|table|title';
 
-		$user = new phpbb_mock_user();
-		$user->lang = new phpbb_mock_lang();
-
 		$this->config = &$config;
 		$this->path = __DIR__ . '/fixture/';
 
@@ -75,8 +73,9 @@ class phpbb_filespec_test extends phpbb_test_case
 		$guessers[2]->set_priority(-2);
 		$guessers[3]->set_priority(-2);
 		$this->mimetype_guesser = new \phpbb\mimetype\guesser($guessers);
+		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 
-		$this->filesystem = $phpbb_filesystem = new \phpbb\filesystem\filesystem();
+		$this->filesystem = new \phpbb\filesystem\filesystem();
 	}
 
 	private function get_filespec($override = array())
@@ -90,15 +89,13 @@ class phpbb_filespec_test extends phpbb_test_case
 			'error' => '',
 		);
 
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->mimetype_guesser);
 		return $filespec->set_upload_ary(array_merge($upload_ary, $override));
 	}
 
 	protected function tearDown()
 	{
-		global $user;
 		$this->config = array();
-		$user = null;
 
 		$iterator = new DirectoryIterator($this->path . 'copies');
 		foreach ($iterator as $fileinfo)
@@ -289,7 +286,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			array('txt_copy', 'txt_as_img', 'image/jpg', 'txt', false, true),
 			array('txt_copy_2', 'txt_moved', 'text/plain', 'txt', false, true),
 			array('jpg_copy', 'jpg_moved', 'image/png', 'jpg', false, true),
-			array('png_copy', 'png_moved', 'image/png', 'jpg', 'IMAGE_FILETYPE_MISMATCH png jpg', true),
+			array('png_copy', 'png_moved', 'image/png', 'jpg', 'Image file type mismatch: expected extension png but extension jpg given.', true),
 		);
 	}
 
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 87e10ac954..56e29a3ac2 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -33,9 +33,8 @@ class phpbb_fileupload_test extends phpbb_test_case
 	protected function setUp()
 	{
 		// Global $config required by unique_id
-		// Global $user required by several functions dealing with translations
 		// Global $request required by form_upload, local_upload and is_valid
-		global $config, $user, $request, $phpbb_filesystem, $phpbb_root_path, $phpEx;
+		global $config, $request, $phpbb_root_path, $phpEx;
 
 		if (!is_array($config))
 		{
@@ -45,23 +44,20 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$config['rand_seed'] = '';
 		$config['rand_seed_last_update'] = time() + 600;
 
-		$user = new phpbb_mock_user();
-		$user->lang = new phpbb_mock_lang();
-
 		$request = new phpbb_mock_request();
 
-		$this->filesystem = $phpbb_filesystem = new \phpbb\filesystem\filesystem();
+		$this->filesystem = new \phpbb\filesystem\filesystem();
+		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 
 		$this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx);
 		$this->container->set('files.filespec', new \phpbb\files\filespec(
 			$this->filesystem,
+			$this->language,
 			new \phpbb\mimetype\guesser(array(
 				'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
 			))));
 		$this->factory = new \phpbb\files\factory($this->container);
 
-		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
-
 		$this->path = __DIR__ . '/fixture/';
 	}