makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/twig] Remove style dependency for controller helper

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

PHPBB3-11598
This commit is contained in:
Nathan Guse 2013-07-05 12:11:59 -05:00
parent 1f4a717f9e
commit 13c3565454
3 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/services.yml
View file

@ -69,7 +69,6 @@ services:
controller.helper: controller.helper:
class: phpbb_controller_helper class: phpbb_controller_helper
arguments: arguments:
- @style
- @template - @template
- @user - @user
- %core.root_path% - %core.root_path%

25
phpBB/includes/controller/helper.php
View file

@ -23,12 +23,6 @@ use Symfony\Component\HttpFoundation\Response;
*/ */
class phpbb_controller_helper class phpbb_controller_helper
{ {
/**
* Style object
* @var phpbb_style
*/
protected $style;
/** /**
* Template object * Template object
* @var phpbb_template * @var phpbb_template
@ -56,36 +50,19 @@ class phpbb_controller_helper
/** /**
* Constructor * Constructor
* *
* @param phpbb_style $style Style object
* @param phpbb_template $template Template object * @param phpbb_template $template Template object
* @param phpbb_user $user User object * @param phpbb_user $user User object
* @param string $phpbb_root_path phpBB root path * @param string $phpbb_root_path phpBB root path
* @param string $php_ext PHP extension * @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->template = $template;
$this->user = $user; $this->user = $user;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext; $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. * Automate setting up the page and creating the response object.
* *

2
tests/controller/helper_url_test.php
View file

@ -55,7 +55,7 @@ class phpbb_controller_helper_url_test extends phpbb_test_case
$this->style_provider = new phpbb_style_path_provider(); $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); $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); $this->assertEquals($helper->url($route, $params, $is_amp, $session_id), $expected);
} }
} }