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

[ticket/11495] Use constructor arguments over properties in implementation

Browse source 
PHPBB3-11495
This commit is contained in:
Joas Schilling 2013-04-25 18:09:21 +02:00
parent ce07b27765
commit 0def8b7d9c
2 changed files with 47 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
phpBB/includes/tree/nestedset.php
View file

@ -55,6 +55,37 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
*/ */
protected $item_basic_data = array('*'); protected $item_basic_data = array('*');
/**
* Construct
*
* @param phpbb_db_driver $db Database connection
* @param phpbb_lock_db $lock Lock class used to lock the table when moving forums around
* @param string $table_name Table name
* @param string $message_prefix Prefix for the messages thrown by exceptions
* @param string $sql_where Additional SQL restrictions for the queries
* @param array $item_basic_data Array with basic item data that is stored in item_parents
* @param array $columns Array with column names to overwrite
*/
public function __construct(phpbb_db_driver $db, phpbb_lock_db $lock, $table_name, $message_prefix = '', $sql_where = '', $item_basic_data = array(), $columns = array())
{
$this->db = $db;
$this->lock = $lock;
$this->table_name = $table_name;
$this->message_prefix = $message_prefix;
$this->sql_where = $sql_where;
$this->item_basic_data = (!empty($item_basic_data)) ? $item_basic_data : array('*');
if (!empty($columns))
{
foreach ($columns as $column => $name)
{
$column_name = 'column_' . $column;
$this->$column_name = $name;
}
}
}
/** /**
* Returns additional sql where restrictions * Returns additional sql where restrictions
* *

38
phpBB/includes/tree/nestedset_forum.php
View file

@ -17,25 +17,6 @@ if (!defined('IN_PHPBB'))
class phpbb_tree_nestedset_forum extends phpbb_tree_nestedset class phpbb_tree_nestedset_forum extends phpbb_tree_nestedset
{ {
/**
* Column names in the table
* @var string
*/
protected $column_item_id = 'forum_id';
protected $column_item_parents = 'forum_parents';
/**
* Prefix for the language keys returned by exceptions
* @var string
*/
protected $message_prefix = 'FORUM_NESTEDSET_';
/**
* List of item properties to be cached in $item_parents
* @var array
*/
protected $item_basic_data = array('forum_id', 'forum_name', 'forum_type');
/** /**
* Construct * Construct
* *
@ -45,8 +26,21 @@ class phpbb_tree_nestedset_forum extends phpbb_tree_nestedset
*/ */
public function __construct(phpbb_db_driver $db, phpbb_lock_db $lock, $table_name) public function __construct(phpbb_db_driver $db, phpbb_lock_db $lock, $table_name)
{ {
$this->db = $db; parent::__construct(
$this->lock = $lock; $db,
$this->table_name = $table_name; $lock,
$table_name,
'FORUM_NESTEDSET_',
'',
array(
'forum_id',
'forum_name',
'forum_type',
),
array(
'item_id' => 'forum_id',
'item_parents' => 'forum_parents',
)
);
} }
} }