makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/merging-style-components] Moving template initialization out of style

Browse source 
Moving template initialization out of style constructor

PHPBB3-10632
This commit is contained in:
Vjacheslav Trushkin 2012-03-31 18:10:00 +03:00
parent 0540509f14
commit 17989c17a0
7 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/common.php
View file

@ -126,8 +126,8 @@ $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_ro
// Initialize style // Initialize style
$phpbb_style_resource_locator = new phpbb_style_resource_locator(); $phpbb_style_resource_locator = new phpbb_style_resource_locator();
$phpbb_style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider()); $phpbb_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, $phpbb_style_resource_locator, $phpbb_style_path_provider); $template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
$template = $style->template; $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
$phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager); $phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
$phpbb_subscriber_loader->load(); $phpbb_subscriber_loader->load();

4
phpBB/includes/bbcode.php
View file

@ -134,9 +134,9 @@ class bbcode
$style_resource_locator = new phpbb_style_resource_locator(); $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_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); $template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider);
$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template);
$style->set_style(); $style->set_style();
$template = $style->template;
$template->set_filenames(array('bbcode.html' => 'bbcode.html')); $template->set_filenames(array('bbcode.html' => 'bbcode.html'));
$this->template_filename = $style_resource_locator->get_source_file_for_handle('bbcode.html'); $this->template_filename = $style_resource_locator->get_source_file_for_handle('bbcode.html');
} }

7
phpBB/includes/functions_messenger.php
View file

@ -210,9 +210,9 @@ class messenger
{ {
$style_resource_locator = new phpbb_style_resource_locator(); $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_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); $tpl = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider);
$stl = &$this->tpl_msg[$template_lang . $template_file]; $stl = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl);
$tpl = $stl->template; $this->tpl_msg[$template_lang . $template_file] = $tpl;
$fallback_template_path = false; $fallback_template_path = false;
@ -238,7 +238,6 @@ class messenger
} }
$this->tpl_obj = &$this->tpl_msg[$template_lang . $template_file]; $this->tpl_obj = &$this->tpl_msg[$template_lang . $template_file];
$this->tpl_obj = $this->tpl_obj->template;
$this->vars = &$this->tpl_obj->_rootref; $this->vars = &$this->tpl_obj->_rootref;
$this->tpl_msg = ''; $this->tpl_msg = '';

7
phpBB/includes/style/style.php
View file

@ -25,7 +25,7 @@ class phpbb_style
* @var phpbb_style_template Template class. * @var phpbb_style_template Template class.
* Handles everything related to templates. * Handles everything related to templates.
*/ */
public $template; private $template;
/** /**
* @var string phpBB root path * @var string phpBB root path
@ -66,8 +66,9 @@ class phpbb_style
* @param user $user current user * @param user $user current user
* @param phpbb_style_resource_locator $locator style resource locator * @param phpbb_style_resource_locator $locator style resource locator
* @param phpbb_style_path_provider $provider style path provider * @param phpbb_style_path_provider $provider style path provider
* @param phpbb_style_template $template template
*/ */
public function __construct($phpbb_root_path, $phpEx, $config, $user, phpbb_style_resource_locator $locator, phpbb_style_path_provider_interface $provider) public function __construct($phpbb_root_path, $phpEx, $config, $user, phpbb_style_resource_locator $locator, phpbb_style_path_provider_interface $provider, phpbb_style_template $template)
{ {
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->phpEx = $phpEx; $this->phpEx = $phpEx;
@ -75,7 +76,7 @@ class phpbb_style
$this->user = $user; $this->user = $user;
$this->locator = $locator; $this->locator = $locator;
$this->provider = $provider; $this->provider = $provider;
$this->template = new phpbb_style_template($this->phpbb_root_path, $this->phpEx, $this->config, $this->user, $this->locator, $this->provider); $this->template = $template;
} }
/** /**

4
phpBB/install/index.php
View file

@ -204,10 +204,10 @@ $config = new phpbb_config(array(
$phpbb_style_resource_locator = new phpbb_style_resource_locator(); $phpbb_style_resource_locator = new phpbb_style_resource_locator();
$phpbb_style_path_provider = new phpbb_style_path_provider(); $phpbb_style_path_provider = new phpbb_style_path_provider();
$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider); $template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
$style->set_ext_dir_prefix('adm/'); $style->set_ext_dir_prefix('adm/');
$style->set_custom_style('admin', '../adm/style', ''); $style->set_custom_style('admin', '../adm/style', '');
$template = $style->template;
$template->assign_var('T_ASSETS_PATH', '../assets'); $template->assign_var('T_ASSETS_PATH', '../assets');
$template->assign_var('T_TEMPLATE_PATH', '../adm/style'); $template->assign_var('T_TEMPLATE_PATH', '../adm/style');

4
tests/template/template_inheritance_test.php
View file

@ -73,8 +73,8 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t
$this->parent_template_path = dirname(__FILE__) . '/parent_templates'; $this->parent_template_path = dirname(__FILE__) . '/parent_templates';
$this->style_resource_locator = new phpbb_style_path_provider(); $this->style_resource_locator = new phpbb_style_path_provider();
$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, $config, $user, $this->style_resource_locator, $this->style_provider); $this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), ''); $this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
$this->template = $this->style->template;
} }
} }

4
tests/template/template_test_case.php
View file

@ -66,9 +66,9 @@ class phpbb_template_template_test_case extends phpbb_test_case
$this->template_path = dirname(__FILE__) . '/templates'; $this->template_path = dirname(__FILE__) . '/templates';
$this->style_resource_locator = new phpbb_style_path_provider(); $this->style_resource_locator = new phpbb_style_path_provider();
$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, $config, $user, $this->style_resource_locator, $this->style_provider); $this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider);
$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
$this->style->set_custom_style('tests', $this->template_path, ''); $this->style->set_custom_style('tests', $this->template_path, '');
$this->template = $this->style->template;
} }
protected function setUp() protected function setUp()