aboutsummaryrefslogtreecommitdiffstats
path: root/tests/text_formatter/s9e
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-10-11 21:00:33 +0200
committerMarc Alexander <admin@m-a-styles.de>2017-10-11 21:00:33 +0200
commit2c01fe67e9313565741f20d207ffb289b1d0b2d3 (patch)
tree0359ae3283bd18e8f7b2888531a66379a6d7c06b /tests/text_formatter/s9e
parent2f799fa9939647d890bbb9584a3ee39d2dafce17 (diff)
parent7b489638d77edeec58a1e055ad329e517c1bf6e4 (diff)
downloadforums-2c01fe67e9313565741f20d207ffb289b1d0b2d3.tar
forums-2c01fe67e9313565741f20d207ffb289b1d0b2d3.tar.gz
forums-2c01fe67e9313565741f20d207ffb289b1d0b2d3.tar.bz2
forums-2c01fe67e9313565741f20d207ffb289b1d0b2d3.tar.xz
forums-2c01fe67e9313565741f20d207ffb289b1d0b2d3.zip
Merge pull request #4942 from rubencm/ticket/15172
[ticket/15172] Fix redirection to wrong port
Diffstat (limited to 'tests/text_formatter/s9e')
-rw-r--r--tests/text_formatter/s9e/factory_test.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/text_formatter/s9e/factory_test.php b/tests/text_formatter/s9e/factory_test.php
index 82b1b0043b..fd9b4e4c09 100644
--- a/tests/text_formatter/s9e/factory_test.php
+++ b/tests/text_formatter/s9e/factory_test.php
@@ -34,7 +34,7 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case
public function get_factory($styles_path = null)
{
- global $config, $phpbb_root_path, $request, $user;
+ global $config, $phpbb_root_path, $request, $symfony_request, $user;
if (!isset($styles_path))
{
@@ -69,6 +69,7 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case
'server_protocol' => 'http://',
));
$request = new phpbb_mock_request;
+ $symfony_request = new \phpbb\symfony_request($request);
$user = new phpbb_mock_user;
return $factory;
@@ -152,7 +153,7 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case
public function test_local_url()
{
- global $config, $user, $request;
+ global $config, $user, $request, $symfony_request;
$config = new \phpbb\config\config(array(
'force_server_vars' => true,
'server_protocol' => 'http://',
@@ -163,6 +164,7 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case
));
$user = new phpbb_mock_user;
$request = new phpbb_mock_request;
+ $symfony_request = new \phpbb\symfony_request($request);
$fixture = __DIR__ . '/fixtures/local_url.xml';
$renderer = $this->get_test_case_helpers()->set_s9e_services(null, $fixture)->get('text_formatter.renderer');