11 files changed, 16 insertions, 16 deletions
diff --git a/tests/controller/helper_url_test.php b/tests/controller/helper_url_test.php
index 6e53db9ba2..4ea177074f 100644
--- a/tests/controller/helper_url_test.php
+++ b/tests/controller/helper_url_test.php
@@ -50,7 +50,7 @@ class phpbb_controller_helper_url_test extends phpbb_test_case
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
 		$this->user = $this->getMock('\phpbb\user');
 		$phpbb_filesystem = new \phpbb\filesystem(
-			new \phpbb\symfony\request(
+			new \phpbb\symfony_request(
 				new phpbb_mock_request()
 			),
 			$phpbb_root_path,
@@ -102,7 +102,7 @@ class phpbb_controller_helper_url_test extends phpbb_test_case
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
 		$this->user = $this->getMock('\phpbb\user');
 		$phpbb_filesystem = new \phpbb\filesystem(
-			new \phpbb\symfony\request(
+			new \phpbb\symfony_request(
 				new phpbb_mock_request()
 			),
 			$phpbb_root_path,
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php
index 6481e09ead..ef5d167fc2 100644
--- a/tests/dbal/migrator_test.php
+++ b/tests/dbal/migrator_test.php
@@ -60,7 +60,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 			$this->db,
 			$this->config,
 			new phpbb\filesystem(
-				new phpbb\symfony\request(
+				new phpbb\symfony_request(
 					new phpbb_mock_request()
 				),
 				dirname(__FILE__) . '/../../phpBB/',
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index d694d298fa..c4a32f53ab 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -115,7 +115,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 			$db,
 			$config,
 			new \phpbb\filesystem(
-				new \phpbb\symfony\request(
+				new \phpbb\symfony_request(
 					new phpbb_mock_request()
 				),
 				$phpbb_root_path,
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index b68bf8e36a..2b27a1bae2 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -42,7 +42,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 
 		$this->template = new \phpbb\template\twig\twig(
 			new \phpbb\filesystem(
-				new \phpbb\symfony\request(
+				new \phpbb\symfony_request(
 					new phpbb_mock_request()
 				),
 				$this->phpbb_root_path,
@@ -71,7 +71,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 			$this->db,
 			$this->config,
 			new \phpbb\filesystem(
-				new \phpbb\symfony\request(
+				new \phpbb\symfony_request(
 					new phpbb_mock_request()
 				),
 				$this->phpbb_root_path,
diff --git a/tests/filesystem/clean_path_test.php b/tests/filesystem/clean_path_test.php
index 7fefcf2f90..5b9857ef2c 100644
--- a/tests/filesystem/clean_path_test.php
+++ b/tests/filesystem/clean_path_test.php
@@ -15,7 +15,7 @@ class phpbb_filesystem_clean_path_test extends phpbb_test_case
 	{
 		parent::setUp();
 		$this->filesystem = new \phpbb\filesystem(
-			new \phpbb\symfony\request(
+			new \phpbb\symfony_request(
 				new phpbb_mock_request()
 			),
 			dirname(__FILE__) . './../../phpBB/',
diff --git a/tests/filesystem/web_root_path_test.php b/tests/filesystem/web_root_path_test.php
index ae59d4f709..ddc9e28bb2 100644
--- a/tests/filesystem/web_root_path_test.php
+++ b/tests/filesystem/web_root_path_test.php
@@ -18,8 +18,8 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case
 
 		$this->set_phpbb_root_path();
 
-		$this->filesystem = new phpbb_filesystem(
-			new phpbb_symfony_request(
+		$this->filesystem = new \phpbb\filesystem(
+			new \phpbb\symfony_request(
 				new phpbb_mock_request()
 			),
 			$this->phpbb_root_path,
diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php
index 82065fc37d..0c6b8447f1 100644
--- a/tests/mock/extension_manager.php
+++ b/tests/mock/extension_manager.php
@@ -15,7 +15,7 @@ class phpbb_mock_extension_manager extends \phpbb\extension\manager
 		$this->php_ext = 'php';
 		$this->extensions = $extensions;
 		$this->filesystem = new \phpbb\filesystem(
-			new \phpbb\symfony\request(
+			new \phpbb\symfony_request(
 				new phpbb_mock_request()
 			),
 			$this->phpbb_root_path,
diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php
index 41ece4972b..4155d5fd83 100644
--- a/tests/template/template_events_test.php
+++ b/tests/template/template_events_test.php
@@ -117,7 +117,7 @@ Zeta test event in all',
 			dirname(__FILE__) . "/datasets/$dataset/"
 		);
 		$phpbb_filesystem = new \phpbb\filesystem(
-			new \phpbb\symfony\request(
+			new \phpbb\symfony_request(
 				new phpbb_mock_request()
 			),
 			$phpbb_root_path,
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index c9b38ee40d..e9cbdec1d9 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -63,8 +63,8 @@ class phpbb_template_template_test_case extends phpbb_test_case
 		$config = new \phpbb\config\config(array_merge($defaults, $new_config));
 		$this->user = new \phpbb\user;
 
-		$phpbb_filesystem = new phpbb_filesystem(
-			new phpbb_symfony_request(
+		$phpbb_filesystem = new \phpbb\filesystem(
+			new \phpbb\symfony_request(
 				new phpbb_mock_request()
 			),
 			$phpbb_root_path,
diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php
index 7f7cffdb82..232331d37c 100644
--- a/tests/template/template_test_case_with_tree.php
+++ b/tests/template/template_test_case_with_tree.php
@@ -18,8 +18,8 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
 		$defaults = $this->config_defaults();
 		$config = new \phpbb\config\config(array_merge($defaults, $new_config));
 
-		$this->phpbb_filesystem = new phpbb_filesystem(
-			new phpbb_symfony_request(
+		$this->phpbb_filesystem = new \phpbb\filesystem(
+			new \phpbb\symfony_request(
 				new phpbb_mock_request()
 			),
 			$phpbb_root_path,
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index f8ec125481..f87b3538a1 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -204,7 +204,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 			$db,
 			$config,
 			new phpbb\filesystem(
-				new phpbb\symfony\request(
+				new phpbb\symfony_request(
 					new phpbb_mock_request()
 				),
 				$phpbb_root_path,