Merge pull request #4614 from marc1706/ticket/14838

[ticket/14838] Add missing method to mock'ed feed

2 files changed, 11 insertions, 1 deletions

diff --git a/tests/feed/attachments_base_test.php b/tests/feed/attachments_base_test.php
index c980dfd3d7..dd432d13f5 100644
--- a/tests/feed/attachments_base_test.php
+++ b/tests/feed/attachments_base_test.php
@@ -31,7 +31,12 @@ 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');
+		$user = new \phpbb\user(
+			new \phpbb\language\language(
+				new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)
+			),
+			'\phpbb\datetime'
+		);
 		$feed_helper = new \phpbb\feed\helper($config, $user, $phpbb_root_path, $phpEx);
 		$db = $this->new_dbal();
 		$cache = new \phpbb_mock_cache();
diff --git a/tests/feed/attachments_mock_feed.php b/tests/feed/attachments_mock_feed.php
index 0e623fed24..fb67a48f7c 100644
--- a/tests/feed/attachments_mock_feed.php
+++ b/tests/feed/attachments_mock_feed.php
@@ -28,4 +28,9 @@ class phpbb_feed_attachments_mock_feed extends \phpbb\feed\attachments_base
 
 		return true;
 	}
+
+	public function adjust_item(&$item_row, &$row)
+	{
+		return array();
+	}
 }