makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15253] Fix rebase

Browse source 
PHPBB3-15253
This commit is contained in:
Rubén Calvo 2017-07-20 17:08:07 +02:00
parent c18c40aaa5
commit c3a422bdeb
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/template/template_test_case.php
View file

@ -86,12 +86,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
new \phpbb\symfony_request( new \phpbb\symfony_request(
new phpbb_mock_request() new phpbb_mock_request()
), ),
<<<<<<< HEAD
$filesystem,
$this->createMock('\phpbb\request\request'), $this->createMock('\phpbb\request\request'),
=======
$this->getMock('\phpbb\request\request'),
>>>>>>> [ticket/15253] Use storage helper methods instead of filesystem methods
$phpbb_root_path, $phpbb_root_path,
$phpEx $phpEx
); );