mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source
This commit is contained in:
Joas Schilling
2014-10-02 15:36:02 +02:00
parent a3456c90c9 90241ae4e6
commit ea1eff4fa5
4 changed files with 56 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/mock/event_dispatcher.php
View File

@@ -11,9 +11,18 @@
*
*/
class phpbb_mock_event_dispatcher
class phpbb_mock_event_dispatcher extends \phpbb\event\dispatcher
{
public function trigger_event($eventName, $data)
/**
* Constructor.
*
* Overwrite the constructor to get rid of ContainerInterface param instance
*/
public function __construct()
{
}
public function trigger_event($eventName, $data = array())
{
return array();
}

4
tests/pagination/pagination_test.php
View File

@@ -28,7 +28,7 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
global $phpbb_dispatcher;
$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$this->user = $this->getMock('\phpbb\user', array(), array('\phpbb\datetime'));
$this->user->expects($this->any())
->method('lang')
@@ -58,7 +58,7 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
);
$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $provider, $manager, $symfony_request, $filesystem, '', 'php', dirname(__FILE__) . '/');
$this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper);
$this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper, $phpbb_dispatcher);
}
public function generate_template_pagination_data()