12 files changed, 5 insertions, 19 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index a7addf510b..fdc8aa5870 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -300,7 +300,6 @@ services:
             - @symfony_request
             - @filesystem
             - @request
-            - @config
             - %core.root_path%
             - %core.php_ext%
             - %core.adm_relative_path%
diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php
index 8552dbeb3a..ea45393709 100644
--- a/phpBB/phpbb/path_helper.php
+++ b/phpBB/phpbb/path_helper.php
@@ -27,9 +27,6 @@ class path_helper
 	/** @var \phpbb\request\request_interface */
 	protected $request;
 
-	/** @var \phpbb\config\config */
-	protected $config;
-
 	/** @var string */
 	protected $phpbb_root_path;
 
@@ -47,17 +44,16 @@ class path_helper
 	*
 	* @param \phpbb\symfony_request $symfony_request
 	* @param \phpbb\filesystem $filesystem
-	* @param \phpbb\request\request $request
-	* @param \phpbb\config\config $config
+	* @param \phpbb\request\request_interface $request
 	* @param string $phpbb_root_path Relative path to phpBB root
 	* @param string $php_ext PHP extension (php)
+	* @param mixed $adm_relative_path Relative path admin path to adm/ root
 	*/
-	public function __construct(\phpbb\symfony_request $symfony_request, \phpbb\filesystem $filesystem, \phpbb\request\request $request, \phpbb\config\config $config, $phpbb_root_path, $php_ext, $adm_relative_path = null)
+	public function __construct(\phpbb\symfony_request $symfony_request, \phpbb\filesystem $filesystem, \phpbb\request\request_interface $request, $phpbb_root_path, $php_ext, $adm_relative_path = null)
 	{
 		$this->symfony_request = $symfony_request;
 		$this->filesystem = $filesystem;
 		$this->request = $request;
-		$this->config = $config;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 		$this->adm_relative_path = $adm_relative_path;
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
 		);