diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-11-16 16:50:29 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-11-16 16:50:29 +0100 |
| commit | 6104be6b4d37f6ce569fde95c88400724dabac13 (patch) | |
| tree | d92f43d438d5b6516a3538f826c81fe29522f2ab /tests/pagination/pagination_test.php | |
| parent | f1b88706b8930186c8a2dbe216769e2f8350af38 (diff) | |
| parent | 4ffdb129388d72cdcc790f1c3713e3770d8aeca9 (diff) | |
| download | forums-6104be6b4d37f6ce569fde95c88400724dabac13.tar forums-6104be6b4d37f6ce569fde95c88400724dabac13.tar.gz forums-6104be6b4d37f6ce569fde95c88400724dabac13.tar.bz2 forums-6104be6b4d37f6ce569fde95c88400724dabac13.tar.xz forums-6104be6b4d37f6ce569fde95c88400724dabac13.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13280] Output escaping for the symfony request object
[ticket/13280] Add new tests
[ticket/13280] Make the tests failing
[ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
Diffstat (limited to 'tests/pagination/pagination_test.php')
| -rw-r--r-- | tests/pagination/pagination_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php index d36aa11a8a..494c667198 100644 --- a/tests/pagination/pagination_test.php +++ b/tests/pagination/pagination_test.php @@ -57,7 +57,7 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case $request ); - $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $provider, $manager, $symfony_request, $filesystem, '', 'php', dirname(__FILE__) . '/'); + $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $provider, $manager, $symfony_request, $request, $filesystem, '', 'php', dirname(__FILE__) . '/'); $this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper, $phpbb_dispatcher); } |