From 1db7aa712af0521f1a64e90c6fcf4972ac5b08c2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 4 Jan 2017 19:19:02 +0100 Subject: [PATCH 1/2] [ticket/14838] Add missing method to mock'ed feed PHPBB3-14838 --- tests/feed/attachments_mock_feed.php | 5 +++++ 1 file changed, 5 insertions(+) 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(); + } } From b582a19039acb004d38927cde29f459f8bf4039f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 4 Jan 2017 19:47:10 +0100 Subject: [PATCH 2/2] [ticket/14838] Correctly instantiate language object PHPBB3-14838 --- tests/feed/attachments_base_test.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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();