Merge remote-tracking branch 'upstream/prep-release-3.2.9'

1 files changed, 8 insertions, 7 deletions

diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php
index b2d497b72a..35c3d92a3a 100644
--- a/tests/version/version_helper_remote_test.php
+++ b/tests/version/version_helper_remote_test.php
@@ -30,21 +30,22 @@ class version_helper_remote_test extends \phpbb_test_case
 		));
 		$container = new \phpbb_mock_container_builder();
 		$db = new \phpbb\db\driver\factory($container);
-		$this->cache = $this->getMock('\phpbb\cache\service', array('get'), array(new \phpbb\cache\driver\null(), $config, $db, '../../', 'php'));
+		$this->cache = $this->getMock('\phpbb\cache\service', array('get'), array(new \phpbb\cache\driver\dummy(), $config, $db, '../../', 'php'));
 		$this->cache->expects($this->any())
 			->method('get')
 			->with($this->anything())
 			->will($this->returnValue(false));
 		$this->file_downloader = new phpbb_mock_file_downloader();
 
-		$this->user = new \phpbb\user('\phpbb\datetime');
-		$this->user->add_lang('acp/common');
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+
 		$this->version_helper = new \phpbb\version_helper(
 			$this->cache,
 			$config,
-			$this->file_downloader,
-			$this->user
+			$this->file_downloader
 		);
+		$this->user = new \phpbb\user(new \phpbb\language\language($lang_loader), '\phpbb\datetime');
+		$this->user->add_lang('acp/common');
 	}
 
 	public function provider_get_versions()
@@ -202,8 +203,8 @@ class version_helper_remote_test extends \phpbb_test_case
 		{
 			try {
 				$return = $this->version_helper->get_versions();
-			} catch (\RuntimeException $e) {
-				$this->assertEquals((string)$e->getMessage(), $this->user->lang($expected_exception));
+			} catch (\phpbb\exception\runtime_exception $e) {
+				$this->assertEquals((string)$e->getMessage(), $expected_exception);
 			}
 		}
 		else