aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2016-03-29 19:13:09 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-03-29 19:13:09 +0200
commit0647eea742bef8d6ee932462f3775e45a6a05bd6 (patch)
treeb79b88d557989fdd6f166bc45bcec496b63017a8 /tests
parent0b1ed8dbbb3792b97726282fdc630cc242def2ad (diff)
downloadforums-0647eea742bef8d6ee932462f3775e45a6a05bd6.tar
forums-0647eea742bef8d6ee932462f3775e45a6a05bd6.tar.gz
forums-0647eea742bef8d6ee932462f3775e45a6a05bd6.tar.bz2
forums-0647eea742bef8d6ee932462f3775e45a6a05bd6.tar.xz
forums-0647eea742bef8d6ee932462f3775e45a6a05bd6.zip
[ticket/13683] Updates tests
PHPBB3-13683
Diffstat (limited to 'tests')
-rw-r--r--tests/controller/common_helper_route.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php
index b3ec8b256a..ea77a289c9 100644
--- a/tests/controller/common_helper_route.php
+++ b/tests/controller/common_helper_route.php
@@ -435,14 +435,14 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
public function helper_url_data_force_server_vars()
{
return array(
- array(false, true, 'my_server', 443, '/my/board', 'http', UrlGeneratorInterface::ABSOLUTE_URL, 'http://my_server:443/my/board/app.php/foo'),
- array(true, true, 'my_server', 443, '/my/board', 'http', UrlGeneratorInterface::ABSOLUTE_URL, 'http://my_server:443/my/board/foo'),
- array(false, true, 'my_server', 443, '/my/board', 'http', UrlGeneratorInterface::NETWORK_PATH, '//my_server:443/my/board/app.php/foo'),
- array(true, true, 'my_server', 443, '/my/board', 'http', UrlGeneratorInterface::NETWORK_PATH, '//my_server:443/my/board/foo'),
- array(false, true, 'my_server', 443, '/my/board', 'http', UrlGeneratorInterface::ABSOLUTE_PATH, '/my/board/app.php/foo'),
- array(true, true, 'my_server', 443, '/my/board', 'http', UrlGeneratorInterface::ABSOLUTE_PATH, '/my/board/foo'),
- array(false, true, 'my_server', 443, '/my/board', 'http', UrlGeneratorInterface::RELATIVE_PATH, 'app.php/foo'),
- array(true, true, 'my_server', 443, '/my/board', 'http', UrlGeneratorInterface::RELATIVE_PATH, 'foo'),
+ array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_URL, 'http://my_server:443/my/board/app.php/foo'),
+ array(true, true, 'my_server', 444, '/my/board', 'https://', UrlGeneratorInterface::ABSOLUTE_URL, 'https://my_server:444/my/board/foo'),
+ array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::NETWORK_PATH, '//my_server:443/my/board/app.php/foo'),
+ array(true, true, 'my_server', 444, '/my/board', 'https://', UrlGeneratorInterface::NETWORK_PATH, '//my_server:444/my/board/foo'),
+ array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_PATH, '/my/board/app.php/foo'),
+ array(true, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_PATH, '/my/board/foo'),
+ array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::RELATIVE_PATH, 'app.php/foo'),
+ array(true, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::RELATIVE_PATH, 'foo'),
);
}