Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531

3 files changed, 6 insertions, 4 deletions

diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index c06bf7d548..dfc4f80469 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -59,7 +59,7 @@ class phpbb_controller_controller_test extends phpbb_test_case
 		}
 		if (!class_exists('phpbb_controller_foo'))
 		{
-			include(__DIR__.'/includes/controller/foo.php');
+			include(__DIR__.'/phpbb/controller/foo.php');
 		}
 
 		$resolver = new phpbb_controller_resolver(new phpbb_user, $container);
diff --git a/tests/controller/helper_url_test.php b/tests/controller/helper_url_test.php
index 2c22700ca6..6686b77e8f 100644
--- a/tests/controller/helper_url_test.php
+++ b/tests/controller/helper_url_test.php
@@ -45,15 +45,17 @@ class phpbb_controller_helper_url_test extends phpbb_test_case
 	*/
 	public function test_helper_url($route, $params, $is_amp, $session_id, $expected, $description)
 	{
-		global $phpbb_dispatcher;
+		global $phpbb_dispatcher, $phpbb_root_path, $phpEx;
 
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
 		$this->style_resource_locator = new phpbb_style_resource_locator();
 		$this->user = $this->getMock('phpbb_user');
-		$this->template = new phpbb_template($phpbb_root_path, $phpEx, $config, $this->user, $this->style_resource_locator, new phpbb_template_context());
+		$this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $this->user, new phpbb_template_context());
+		$this->style_resource_locator = new phpbb_style_resource_locator();
+		$this->style_provider = new phpbb_style_path_provider();
+		$this->style = new phpbb_style($phpbb_root_path, $phpEx, new phpbb_config(array()), $this->user, $this->style_resource_locator, $this->style_provider, $this->template);
 
 		$helper = new phpbb_controller_helper($this->template, $this->user, '', 'php');
 		$this->assertEquals($helper->url($route, $params, $is_amp, $session_id), $expected);
 	}
 }
-
diff --git a/tests/controller/includes/controller/foo.php b/tests/controller/phpbb/controller/foo.php
index 04576e16c4..04576e16c4 100644
--- a/tests/controller/includes/controller/foo.php
+++ b/tests/controller/phpbb/controller/foo.php