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

1 files changed, 19 insertions, 2 deletions

diff --git a/tests/feed/attachments_base_test.php b/tests/feed/attachments_base_test.php
index c980dfd3d7..573218be42 100644
--- a/tests/feed/attachments_base_test.php
+++ b/tests/feed/attachments_base_test.php
@@ -31,8 +31,25 @@ class phpbb_feed_attachments_base_test extends phpbb_database_test_case
 
 		$this->filesystem = new \phpbb\filesystem();
 		$config = new \phpbb\config\config(array());
-		$user = new \phpbb\user('\phpbb\datetime');
-		$feed_helper = new \phpbb\feed\helper($config, $user, $phpbb_root_path, $phpEx);
+		$path_helper = new \phpbb\path_helper(
+			new \phpbb\symfony_request(
+				new phpbb_mock_request()
+			),
+			$this->filesystem,
+			$this->getMock('\phpbb\request\request'),
+			$phpbb_root_path,
+			'php'
+		);
+		$user = new \phpbb\user(
+			new \phpbb\language\language(
+				new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)
+			),
+			'\phpbb\datetime'
+		);
+		$container = new phpbb_mock_container_builder();
+		$this->get_test_case_helpers()->set_s9e_services($container);
+		$container->set('feed.quote_helper', new \phpbb\feed\quote_helper($user, $phpbb_root_path, 'php'));
+		$feed_helper = new \phpbb\feed\helper($config, $container, $path_helper, $container->get('text_formatter.renderer'), $user);
 		$db = $this->new_dbal();
 		$cache = new \phpbb_mock_cache();
 		$auth = new \phpbb\auth\auth();