mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[feature/merging-style-components] Initializing locator and provider separately

Browse Source 
Moving locator and path provider initialization out of style class

PHPBB3-10632
This commit is contained in:
Vjacheslav Trushkin
2012-03-31 17:38:30 +03:00
parent 9611997552
commit 360312f599
7 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/bbcode.php
View File

@@ -132,11 +132,13 @@ class bbcode
{
$this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']);
$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager);
$style_resource_locator = new phpbb_style_resource_locator();
$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider);
$style->set_style();
$template = $style->template;
$template->set_filenames(array('bbcode.html' => 'bbcode.html'));
$this->template_filename = $style->locator->get_source_file_for_handle('bbcode.html');
$this->template_filename = $style_resource_locator->get_source_file_for_handle('bbcode.html');
}
$bbcode_ids = $rowset = $sql = array();

4
phpBB/includes/functions_messenger.php
View File

@@ -208,7 +208,9 @@ class messenger
// tpl_msg now holds a template object we can use to parse the template file
if (!isset($this->tpl_msg[$template_lang . $template_file]))
{
$this->tpl_msg[$template_lang . $template_file] = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager);
$style_resource_locator = new phpbb_style_resource_locator();
$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
$this->tpl_msg[$template_lang . $template_file] = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider);
$stl = &$this->tpl_msg[$template_lang . $template_file];
$tpl = $stl->template;

16
phpBB/includes/style/style.php
View File

@@ -50,9 +50,8 @@ class phpbb_style
/**
* Style resource locator
* @var phpbb_style_resource_locator
* This item is temporary public, until locate() function is implemented
*/
public $locator;
private $locator;
/**
* Style path provider
@@ -65,20 +64,17 @@ class phpbb_style
*
* @param string $phpbb_root_path phpBB root path
* @param user $user current user
* @param phpbb_extension_manager $phpbb_extension_manager extension manager. Set it to false if extension manager should not be used.
* @param phpbb_style_resource_locator $locator style resource locator
* @param phpbb_style_path_provider $provider style path provider
*/
public function __construct($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager = false)
public function __construct($phpbb_root_path, $phpEx, $config, $user, phpbb_style_resource_locator $locator, phpbb_style_path_provider_interface $provider)
{
$this->phpbb_root_path = $phpbb_root_path;
$this->phpEx = $phpEx;
$this->config = $config;
$this->user = $user;
$this->locator = new phpbb_style_resource_locator();
$this->provider = new phpbb_style_path_provider();
if ($phpbb_extension_manager !== false)
{
$this->provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, $this->provider);
}
$this->locator = $locator;
$this->provider = $provider;
$this->template = new phpbb_style_template($this->phpbb_root_path, $this->phpEx, $this->config, $this->user, $this->locator, $this->provider);
}