From 13c356545465a457b8c55dd9638f89165bab6271 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Jul 2013 12:11:59 -0500
Subject: [PATCH] [feature/twig] Remove style dependency for controller helper

If a controller wants to use set_style, it can just use phpbb_style

PHPBB3-11598
---
 phpBB/config/services.yml            |  1 -
 phpBB/includes/controller/helper.php | 25 +------------------------
 tests/controller/helper_url_test.php |  2 +-
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 3d951e2a45..e228b3d83f 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -69,7 +69,6 @@ services:
     controller.helper:
         class: phpbb_controller_helper
         arguments:
-            - @style
             - @template
             - @user
             - %core.root_path%
diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php
index ec09757a5d..74410ddfd1 100644
--- a/phpBB/includes/controller/helper.php
+++ b/phpBB/includes/controller/helper.php
@@ -23,12 +23,6 @@ use Symfony\Component\HttpFoundation\Response;
 */
 class phpbb_controller_helper
 {
-	/**
-	* Style object
-	* @var phpbb_style
-	*/
-	protected $style;
-
 	/**
 	* Template object
 	* @var phpbb_template
@@ -56,36 +50,19 @@ class phpbb_controller_helper
 	/**
 	* Constructor
 	*
-	* @param phpbb_style $style Style object
 	* @param phpbb_template $template Template object
 	* @param phpbb_user $user User object
 	* @param string $phpbb_root_path phpBB root path
 	* @param string $php_ext PHP extension
 	*/
-	public function __construct(phpbb_style $style, phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext)
 	{
-		$this->style = $style;
 		$this->template = $template;
 		$this->user = $user;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 	}
 
-	/**
-	* Set style location based on (current) user's chosen style.
-	*
-	* @param array $style_directories The directories to add style paths for
-	* 	E.g. array('ext/foo/bar/styles', 'styles')
-	* 	Default: array('styles') (phpBB's style directory)
-	* @return phpbb_controller_helper $this
-	*/
-	public function set_style($style_base_directory = array('styles'))
-	{
-		$this->style->set_style($style_base_directory);
-
-		return $this;
-	}
-
 	/**
 	* Automate setting up the page and creating the response object.
 	*
diff --git a/tests/controller/helper_url_test.php b/tests/controller/helper_url_test.php
index 3206460caf..6686b77e8f 100644
--- a/tests/controller/helper_url_test.php
+++ b/tests/controller/helper_url_test.php
@@ -55,7 +55,7 @@ class phpbb_controller_helper_url_test extends phpbb_test_case
 		$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->style, $this->template, $this->user, '', 'php');
+		$helper = new phpbb_controller_helper($this->template, $this->user, '', 'php');
 		$this->assertEquals($helper->url($route, $params, $is_amp, $session_id), $expected);
 	}
 }