aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-07 23:22:53 +0200
committerTristan Darricau <github@nicofuma.fr>2014-06-29 20:54:41 +0200
commitb7e1959d56a3334f730e5d0fd4194f5e4d0597a3 (patch)
treed1db62ad9dcfa88c8f2e99748fdfe330346af04f /tests
parent[ticket/12099] Correctly fix the path when performing AJAX requests (diff)
downloadphpbb-b7e1959d56a3334f730e5d0fd4194f5e4d0597a3.tar.gz
phpbb-b7e1959d56a3334f730e5d0fd4194f5e4d0597a3.tar.bz2
phpbb-b7e1959d56a3334f730e5d0fd4194f5e4d0597a3.zip
[ticket/12099] Remove config again
PHPBB3-12099
Diffstat (limited to 'tests')
-rw-r--r--tests/avatar/manager_test.php1
-rw-r--r--tests/controller/helper_route_test.php1
-rw-r--r--tests/extension/metadata_manager_test.php1
-rw-r--r--tests/functions/build_url_test.php3
-rw-r--r--tests/path_helper/path_helper_test.php2
-rw-r--r--tests/security/redirect_test.php1
-rw-r--r--tests/template/template_events_test.php1
-rw-r--r--tests/template/template_test_case.php1
-rw-r--r--tests/template/template_test_case_with_tree.php1
-rw-r--r--tests/test_framework/phpbb_session_test_case.php1
10 files changed, 2 insertions, 11 deletions
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index 96d3ba1474..de505e2c9f 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -39,7 +39,6 @@ class phpbb_avatar_manager_test extends \phpbb_test_case
),
new \phpbb\filesystem(),
$this->getMock('\phpbb\request\request'),
- $config,
$phpbb_root_path,
$phpEx
);
diff --git a/tests/controller/helper_route_test.php b/tests/controller/helper_route_test.php
index a9e8e46a42..206c3a4f0b 100644
--- a/tests/controller/helper_route_test.php
+++ b/tests/controller/helper_route_test.php
@@ -27,7 +27,6 @@ class phpbb_controller_helper_route_test extends phpbb_test_case
),
new \phpbb\filesystem(),
$this->getMock('\phpbb\request\request'),
- new \phpbb\config\config(array()),
$phpbb_root_path,
$phpEx
);
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index b7f309b2a9..bf7031454e 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -51,7 +51,6 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
),
new \phpbb\filesystem(),
$this->getMock('\phpbb\request\request'),
- new \phpbb\config\config(array()),
$this->phpbb_root_path,
$this->phpEx
),
diff --git a/tests/functions/build_url_test.php b/tests/functions/build_url_test.php
index 7a70bddc71..06415a424e 100644
--- a/tests/functions/build_url_test.php
+++ b/tests/functions/build_url_test.php
@@ -30,10 +30,11 @@ class phpbb_build_url_test extends phpbb_test_case
new phpbb_mock_request()
),
new \phpbb\filesystem(),
+ $this->getMock('\phpbb\request\request'),
$phpbb_root_path,
'php'
);
- $phpbb_container->set('path_helper', $path_helper);
+ $phpbb_container->set('path_helper', $phpbb_path_helper);
}
public function build_url_test_data()
{
diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php
index e7e2ae697f..3990f3abd5 100644
--- a/tests/path_helper/path_helper_test.php
+++ b/tests/path_helper/path_helper_test.php
@@ -30,7 +30,6 @@ class phpbb_path_helper_test extends phpbb_test_case
),
new \phpbb\filesystem(),
$this->getMock('\phpbb\request\request'),
- new \phpbb\config\config(array()),
$this->phpbb_root_path,
'php'
);
@@ -161,7 +160,6 @@ class phpbb_path_helper_test extends phpbb_test_case
$symfony_request,
new \phpbb\filesystem(),
$this->getMock('\phpbb\request\request'),
- new \phpbb\config\config(array()),
$this->phpbb_root_path,
'php'
);
diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php
index 24c42ca8c2..3961c2781e 100644
--- a/tests/security/redirect_test.php
+++ b/tests/security/redirect_test.php
@@ -64,7 +64,6 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
),
new \phpbb\filesystem(),
$this->getMock('\phpbb\request\request'),
- new \phpbb\config\config(array()),
$this->phpbb_root_path,
'php'
);
diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php
index 2c29d42173..c415c969fe 100644
--- a/tests/template/template_events_test.php
+++ b/tests/template/template_events_test.php
@@ -144,7 +144,6 @@ Zeta test event in all',
),
new \phpbb\filesystem(),
$this->getMock('\phpbb\request\request'),
- new \phpbb\config\config(array()),
$phpbb_root_path,
$phpEx
);
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index d393027566..83446b5352 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -73,7 +73,6 @@ class phpbb_template_template_test_case extends phpbb_test_case
),
new \phpbb\filesystem(),
$this->getMock('\phpbb\request\request'),
- new \phpbb\config\config(array()),
$phpbb_root_path,
$phpEx
);
diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php
index c1b22e94e0..68ecc4b706 100644
--- a/tests/template/template_test_case_with_tree.php
+++ b/tests/template/template_test_case_with_tree.php
@@ -28,7 +28,6 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
),
new \phpbb\filesystem(),
$this->getMock('\phpbb\request\request'),
- new \phpbb\config\config(array()),
$phpbb_root_path,
$phpEx
);
diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php
index 144e05b5fa..d4fc174a12 100644
--- a/tests/test_framework/phpbb_session_test_case.php
+++ b/tests/test_framework/phpbb_session_test_case.php
@@ -33,7 +33,6 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case
$symfony_request,
$phpbb_filesystem,
$this->getMock('\phpbb\request\request'),
- new \phpbb\config\config(array()),
$phpbb_root_path,
$phpEx
);