makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2017-01-04 20:12:03 +01:00
commit ac1bf79904
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/feed/attachments_base_test.php
View file

@ -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();

5
tests/feed/attachments_mock_feed.php
View file

@ -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();
}
}