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

[ticket/11495] Use array directly instead of phpbb_nestedset_item_interface

Browse source 
PHPBB3-11495
This commit is contained in:
Joas Schilling 2013-04-18 00:13:19 +02:00
parent 5c379db085
commit 8c3443ba99
3 changed files with 97 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

150
phpBB/includes/nestedset/base.php
View file

@ -81,15 +81,13 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
$item_data[$this->column_item_id] = (int) $this->db->sql_nextid(); $item_data[$this->column_item_id] = (int) $this->db->sql_nextid();
$item = new $this->item_class($item_data); return array_merge($item_data, $this->add($item_data));
return array_merge($item_data, $this->add($item));
} }
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function add(phpbb_nestedset_item_interface $item) public function add(array $item)
{ {
$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . ' $sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
FROM ' . $this->table_name . ' FROM ' . $this->table_name . '
@ -107,7 +105,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
$sql = 'UPDATE ' . $this->table_name . ' $sql = 'UPDATE ' . $this->table_name . '
SET ' . $this->db->sql_build_array('UPDATE', $update_item_data) . ' SET ' . $this->db->sql_build_array('UPDATE', $update_item_data) . '
WHERE ' . $this->column_item_id . ' = ' . $item->get_item_id(); WHERE ' . $this->column_item_id . ' = ' . (int) $item[$this->column_item_id];
$this->db->sql_query($sql); $this->db->sql_query($sql);
return $update_item_data; return $update_item_data;
@ -116,15 +114,15 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function remove(phpbb_nestedset_item_interface $item) public function remove(array $item)
{ {
if ($item->has_children()) if ($item[$this->column_right_id] - $item[$this->column_left_id] > 1)
{ {
$items = array_keys($this->get_branch_data($item, 'children')); $items = array_keys($this->get_branch_data($item, 'children'));
} }
else else
{ {
$items = array($item->get_item_id()); $items = array((int) $item[$this->column_item_id]);
} }
$this->remove_subset($items, $item); $this->remove_subset($items, $item);
@ -135,7 +133,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function delete(phpbb_nestedset_item_interface $item) public function delete(array $item)
{ {
$removed_items = $this->remove($item); $removed_items = $this->remove($item);
@ -150,7 +148,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function move(phpbb_nestedset_item_interface $item, $delta) public function move(array $item, $delta)
{ {
if ($delta == 0) if ($delta == 0)
{ {
@ -168,17 +166,17 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
*/ */
$sql = 'SELECT ' . implode(', ', $this->table_columns) . ' $sql = 'SELECT ' . implode(', ', $this->table_columns) . '
FROM ' . $this->table_name . ' FROM ' . $this->table_name . '
WHERE ' . $this->column_parent_id . ' = ' . $item->get_parent_id() . ' WHERE ' . $this->column_parent_id . ' = ' . (int) $item[$this->column_parent_id] . '
' . $this->get_sql_where() . ' ' . $this->get_sql_where() . '
AND '; AND ';
if ($action == 'move_up') if ($action == 'move_up')
{ {
$sql .= $this->column_right_id . ' < ' . $item->get_right_id() . ' ORDER BY ' . $this->column_right_id . ' DESC'; $sql .= $this->column_right_id . ' < ' . (int) $item[$this->column_right_id] . ' ORDER BY ' . $this->column_right_id . ' DESC';
} }
else else
{ {
$sql .= $this->column_left_id . ' > ' . $item->get_left_id() . ' ORDER BY ' . $this->column_left_id . ' ASC'; $sql .= $this->column_left_id . ' > ' . (int) $item[$this->column_left_id] . ' ORDER BY ' . $this->column_left_id . ' ASC';
} }
$result = $this->db->sql_query_limit($sql, $delta); $result = $this->db->sql_query_limit($sql, $delta);
@ -186,7 +184,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
$target = null; $target = null;
while ($row = $this->db->sql_fetchrow($result)) while ($row = $this->db->sql_fetchrow($result))
{ {
$target = new $this->item_class($row); $target = $row;
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
@ -205,25 +203,25 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
*/ */
if ($action == 'move_up') if ($action == 'move_up')
{ {
$left_id = $target->get_left_id(); $left_id = $target[$this->column_left_id];
$right_id = $item->get_right_id(); $right_id = (int) $item[$this->column_right_id];
$diff_up = $item->get_left_id() - $target->get_left_id(); $diff_up = (int) $item[$this->column_left_id] - $target[$this->column_left_id];
$diff_down = $item->get_right_id() + 1 - $item->get_left_id(); $diff_down = (int) $item[$this->column_right_id] + 1 - (int) $item[$this->column_left_id];
$move_up_left = $item->get_left_id(); $move_up_left = (int) $item[$this->column_left_id];
$move_up_right = $item->get_right_id(); $move_up_right = (int) $item[$this->column_right_id];
} }
else else
{ {
$left_id = $item->get_left_id(); $left_id = (int) $item[$this->column_left_id];
$right_id = $target->get_right_id(); $right_id = $target[$this->column_right_id];
$diff_up = $item->get_right_id() + 1 - $item->get_left_id(); $diff_up = (int) $item[$this->column_right_id] + 1 - (int) $item[$this->column_left_id];
$diff_down = $target->get_right_id() - $item->get_right_id(); $diff_down = $target[$this->column_right_id] - (int) $item[$this->column_right_id];
$move_up_left = $item->get_right_id() + 1; $move_up_left = (int) $item[$this->column_right_id] + 1;
$move_up_right = $target->get_right_id(); $move_up_right = $target[$this->column_right_id];
} }
// Now do the dirty job // Now do the dirty job
@ -249,7 +247,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function move_down(phpbb_nestedset_item_interface $item) public function move_down(array $item)
{ {
return $this->move($item, -1); return $this->move($item, -1);
} }
@ -257,7 +255,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function move_up(phpbb_nestedset_item_interface $item) public function move_up(array $item)
{ {
return $this->move($item, 1); return $this->move($item, 1);
} }
@ -265,16 +263,16 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function move_children(phpbb_nestedset_item_interface $current_parent, phpbb_nestedset_item_interface $new_parent) public function move_children(array $current_parent, array $new_parent)
{ {
if (!$current_parent->has_children() || !$current_parent->get_item_id() || $current_parent->get_item_id() == $new_parent->get_item_id()) if (($current_parent[$this->column_right_id] - $current_parent[$this->column_left_id]) <= 1 || !$current_parent[$this->column_item_id] || $current_parent[$this->column_item_id] == $new_parent[$this->column_item_id])
{ {
return false; return false;
} }
$move_items = array_keys($this->get_branch_data($current_parent, 'children', true, false)); $move_items = array_keys($this->get_branch_data($current_parent, 'children', true, false));
if (in_array($new_parent->get_item_id(), $move_items)) if (in_array($new_parent[$this->column_item_id], $move_items))
{ {
throw new phpbb_nestedset_exception('INVALID_PARENT'); throw new phpbb_nestedset_exception('INVALID_PARENT');
} }
@ -286,33 +284,31 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
$this->remove_subset($move_items, $current_parent, false); $this->remove_subset($move_items, $current_parent, false);
if ($new_parent->get_item_id()) if ($new_parent[$this->column_item_id])
{ {
// Retrieve new-parent again, it may have been changed... // Retrieve new-parent again, it may have been changed...
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . $this->table_name . ' FROM ' . $this->table_name . '
WHERE ' . $this->column_item_id . ' = ' . $new_parent->get_item_id(); WHERE ' . $this->column_item_id . ' = ' . (int) $new_parent[$this->column_item_id];
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$parent_data = $this->db->sql_fetchrow($result); $new_parent = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
if (!$parent_data) if (!$new_parent)
{ {
$this->db->sql_transaction('rollback'); $this->db->sql_transaction('rollback');
throw new phpbb_nestedset_exception('INVALID_PARENT'); throw new phpbb_nestedset_exception('INVALID_PARENT');
} }
$new_parent = new $this->item_class($parent_data);
$new_right_id = $this->prepare_adding_subset($move_items, $new_parent); $new_right_id = $this->prepare_adding_subset($move_items, $new_parent);
if ($new_right_id > $current_parent->get_right_id()) if ($new_right_id > $current_parent[$this->column_right_id])
{ {
$diff = ' + ' . ($new_right_id - $current_parent->get_right_id()); $diff = ' + ' . ($new_right_id - $current_parent[$this->column_right_id]);
} }
else else
{ {
$diff = ' - ' . abs($new_right_id - $current_parent->get_right_id()); $diff = ' - ' . abs($new_right_id - $current_parent[$this->column_right_id]);
} }
} }
else else
@ -325,13 +321,13 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
$row = $this->db->sql_fetchrow($result); $row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
$diff = ' + ' . ($row[$this->column_right_id] - $current_parent->get_left_id()); $diff = ' + ' . ($row[$this->column_right_id] - $current_parent[$this->column_left_id]);
} }
$sql = 'UPDATE ' . $this->table_name . ' $sql = 'UPDATE ' . $this->table_name . '
SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ', SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ', ' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_parent_id . ' = ' . $current_parent->get_item_id(), $new_parent->get_item_id(), $this->column_parent_id) . ', ' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_parent_id . ' = ' . (int) $current_parent[$this->column_item_id], (int) $new_parent[$this->column_item_id], $this->column_parent_id) . ',
' . $this->column_item_parents . " = '' ' . $this->column_item_parents . " = ''
WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . ' WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
' . $this->get_sql_where('AND'); ' . $this->get_sql_where('AND');
@ -345,11 +341,11 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function set_parent(phpbb_nestedset_item_interface $item, phpbb_nestedset_item_interface $new_parent) public function set_parent(array $item, array $new_parent)
{ {
$move_items = array_keys($this->get_branch_data($item, 'children')); $move_items = array_keys($this->get_branch_data($item, 'children'));
if (in_array($new_parent->get_item_id(), $move_items)) if (in_array($new_parent[$this->column_item_id], $move_items))
{ {
throw new phpbb_nestedset_exception('INVALID_PARENT'); throw new phpbb_nestedset_exception('INVALID_PARENT');
} }
@ -361,33 +357,31 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
$this->remove_subset($move_items, $item, false); $this->remove_subset($move_items, $item, false);
if ($new_parent->get_item_id()) if ($new_parent[$this->column_item_id])
{ {
// Retrieve new-parent again, it may have been changed... // Retrieve new-parent again, it may have been changed...
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . $this->table_name . ' FROM ' . $this->table_name . '
WHERE ' . $this->column_item_id . ' = ' . $new_parent->get_item_id(); WHERE ' . $this->column_item_id . ' = ' . (int) $new_parent[$this->column_item_id];
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$parent_data = $this->db->sql_fetchrow($result); $new_parent = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
if (!$parent_data) if (!$new_parent)
{ {
$this->db->sql_transaction('rollback'); $this->db->sql_transaction('rollback');
throw new phpbb_nestedset_exception('INVALID_PARENT'); throw new phpbb_nestedset_exception('INVALID_PARENT');
} }
$new_parent = new $this->item_class($parent_data);
$new_right_id = $this->prepare_adding_subset($move_items, $new_parent); $new_right_id = $this->prepare_adding_subset($move_items, $new_parent);
if ($new_right_id > $item->get_right_id()) if ($new_right_id > (int) $item[$this->column_right_id])
{ {
$diff = ' + ' . ($new_right_id - $item->get_right_id() - 1); $diff = ' + ' . ($new_right_id - (int) $item[$this->column_right_id] - 1);
} }
else else
{ {
$diff = ' - ' . abs($new_right_id - $item->get_right_id() - 1); $diff = ' - ' . abs($new_right_id - (int) $item[$this->column_right_id] - 1);
} }
} }
else else
@ -400,13 +394,13 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
$row = $this->db->sql_fetchrow($result); $row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
$diff = ' + ' . ($row[$this->column_right_id] - $item->get_left_id() + 1); $diff = ' + ' . ($row[$this->column_right_id] - (int) $item[$this->column_left_id] + 1);
} }
$sql = 'UPDATE ' . $this->table_name . ' $sql = 'UPDATE ' . $this->table_name . '
SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ', SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ', ' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_item_id . ' = ' . $item->get_item_id(), $new_parent->get_item_id(), $this->column_parent_id) . ', ' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_item_id . ' = ' . (int) $item[$this->column_item_id], $new_parent[$this->column_item_id], $this->column_parent_id) . ',
' . $this->column_item_parents . " = '' ' . $this->column_item_parents . " = ''
WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . ' WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
' . $this->get_sql_where('AND'); ' . $this->get_sql_where('AND');
@ -420,7 +414,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function get_branch_data(phpbb_nestedset_item_interface $item, $type = 'all', $order_desc = true, $include_item = true) public function get_branch_data(array $item, $type = 'all', $order_desc = true, $include_item = true)
{ {
switch ($type) switch ($type)
{ {
@ -444,19 +438,19 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
FROM ' . $this->table_name . ' i1 FROM ' . $this->table_name . ' i1
LEFT JOIN ' . $this->table_name . " i2 LEFT JOIN ' . $this->table_name . " i2
ON (($condition) " . $this->get_sql_where('AND', 'i2.') . ') ON (($condition) " . $this->get_sql_where('AND', 'i2.') . ')
WHERE i1.' . $this->column_item_id . ' = ' . $item->get_item_id() . ' WHERE i1.' . $this->column_item_id . ' = ' . (int) $item[$this->column_item_id] . '
' . $this->get_sql_where('AND', 'i1.') . ' ' . $this->get_sql_where('AND', 'i1.') . '
ORDER BY i2.' . $this->column_left_id . ' ' . ($order_desc ? 'ASC' : 'DESC'); ORDER BY i2.' . $this->column_left_id . ' ' . ($order_desc ? 'ASC' : 'DESC');
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result)) while ($row = $this->db->sql_fetchrow($result))
{ {
if (!$include_item && $item->get_item_id() === (int) $row[$this->column_item_id]) if (!$include_item && $item[$this->column_item_id] == $row[$this->column_item_id])
{ {
continue; continue;
} }
$rows[$row[$this->column_item_id]] = $row; $rows[(int) $row[$this->column_item_id]] = $row;
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
@ -470,17 +464,17 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
* *
* @inheritdoc * @inheritdoc
*/ */
public function get_parent_data(phpbb_nestedset_item_interface $item) public function get_parent_data(array $item)
{ {
$parents = array(); $parents = array();
if ($item->get_parent_id()) if ((int) $item[$this->column_parent_id])
{ {
if (!$item->get_item_parents_data()) if (!$item[$this->column_item_parents])
{ {
$sql = 'SELECT ' . implode(', ', $this->item_basic_data) . ' $sql = 'SELECT ' . implode(', ', $this->item_basic_data) . '
FROM ' . $this->table_name . ' FROM ' . $this->table_name . '
WHERE ' . $this->column_left_id . ' < ' . $item->get_left_id() . ' WHERE ' . $this->column_left_id . ' < ' . (int) $item[$this->column_left_id] . '
AND ' . $this->column_right_id . ' > ' . $item->get_right_id() . ' AND ' . $this->column_right_id . ' > ' . (int) $item[$this->column_right_id] . '
' . $this->get_sql_where('AND') . ' ' . $this->get_sql_where('AND') . '
ORDER BY ' . $this->column_left_id . ' ASC'; ORDER BY ' . $this->column_left_id . ' ASC';
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
@ -495,12 +489,12 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
$sql = 'UPDATE ' . $this->table_name . ' $sql = 'UPDATE ' . $this->table_name . '
SET ' . $this->column_item_parents . " = '" . $this->db->sql_escape($item_parents) . "' SET ' . $this->column_item_parents . " = '" . $this->db->sql_escape($item_parents) . "'
WHERE " . $this->column_parent_id . ' = ' . $item->get_parent_id(); WHERE " . $this->column_parent_id . ' = ' . (int) $item[$this->column_parent_id];
$this->db->sql_query($sql); $this->db->sql_query($sql);
} }
else else
{ {
$parents = unserialize($item->get_item_parents_data()); $parents = unserialize($item[$this->column_item_parents]);
} }
} }
@ -511,20 +505,20 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
* Remove a subset from the nested set * Remove a subset from the nested set
* *
* @param array $subset_items Subset of items to remove * @param array $subset_items Subset of items to remove
* @param phpbb_nestedset_item_interface $bounding_item Item containing the right bound of the subset * @param array $bounding_item Item containing the right bound of the subset
* @param bool $set_subset_zero Should the parent, left and right id of the item be set to 0, or kept unchanged? * @param bool $set_subset_zero Should the parent, left and right id of the item be set to 0, or kept unchanged?
* @return null * @return null
*/ */
protected function remove_subset(array $subset_items, phpbb_nestedset_item_interface $bounding_item, $set_subset_zero = true) protected function remove_subset(array $subset_items, array $bounding_item, $set_subset_zero = true)
{ {
$diff = sizeof($subset_items) * 2; $diff = sizeof($subset_items) * 2;
$sql_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items); $sql_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items);
$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true); $sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
$sql_is_parent = $this->column_left_id . ' <= ' . $bounding_item->get_right_id() . ' $sql_is_parent = $this->column_left_id . ' <= ' . (int) $bounding_item[$this->column_right_id] . '
AND ' . $this->column_right_id . ' >= ' . $bounding_item->get_right_id(); AND ' . $this->column_right_id . ' >= ' . (int) $bounding_item[$this->column_right_id];
$sql_is_right = $this->column_left_id . ' > ' . $bounding_item->get_right_id(); $sql_is_right = $this->column_left_id . ' > ' . (int) $bounding_item[$this->column_right_id];
$set_left_id = $this->db->sql_case($sql_is_right, $this->column_left_id . ' - ' . $diff, $this->column_left_id); $set_left_id = $this->db->sql_case($sql_is_right, $this->column_left_id . ' - ' . $diff, $this->column_left_id);
$set_right_id = $this->db->sql_case($sql_is_parent . ' OR ' . $sql_is_right, $this->column_right_id . ' - ' . $diff, $this->column_right_id); $set_right_id = $this->db->sql_case($sql_is_parent . ' OR ' . $sql_is_right, $this->column_right_id . ' - ' . $diff, $this->column_right_id);
@ -548,16 +542,16 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
* Add a subset to the nested set * Add a subset to the nested set
* *
* @param array $subset_items Subset of items to add * @param array $subset_items Subset of items to add
* @param phpbb_nestedset_item_interface $new_parent Item containing the right bound of the new parent * @param array $new_parent Item containing the right bound of the new parent
* @return int New right id of the parent item * @return int New right id of the parent item
*/ */
protected function prepare_adding_subset(array $subset_items, phpbb_nestedset_item_interface $new_parent) protected function prepare_adding_subset(array $subset_items, array $new_parent)
{ {
$diff = sizeof($subset_items) * 2; $diff = sizeof($subset_items) * 2;
$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true); $sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
$set_left_id = $this->db->sql_case($this->column_left_id . ' > ' . $new_parent->get_right_id(), $this->column_left_id . ' + ' . $diff, $this->column_left_id); $set_left_id = $this->db->sql_case($this->column_left_id . ' > ' . (int) $new_parent[$this->column_right_id], $this->column_left_id . ' + ' . $diff, $this->column_left_id);
$set_right_id = $this->db->sql_case($this->column_right_id . ' >= ' . $new_parent->get_right_id(), $this->column_right_id . ' + ' . $diff, $this->column_right_id); $set_right_id = $this->db->sql_case($this->column_right_id . ' >= ' . (int) $new_parent[$this->column_right_id], $this->column_right_id . ' + ' . $diff, $this->column_right_id);
$sql = 'UPDATE ' . $this->table_name . ' $sql = 'UPDATE ' . $this->table_name . '
SET ' . $this->column_left_id . ' = ' . $set_left_id . ', SET ' . $this->column_left_id . ' = ' . $set_left_id . ',
@ -567,7 +561,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
' . $this->get_sql_where('AND'); ' . $this->get_sql_where('AND');
$this->db->sql_query($sql); $this->db->sql_query($sql);
return $new_parent->get_right_id() + $diff; return $new_parent[$this->column_right_id] + $diff;
} }
/** /**
@ -603,7 +597,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
$this->column_left_id => $new_id, $this->column_left_id => $new_id,
$this->column_item_parents => '', $this->column_item_parents => '',
)) . ' )) . '
WHERE ' . $this->column_item_id . ' = ' . $row[$this->column_item_id]; WHERE ' . $this->column_item_id . ' = ' . (int) $row[$this->column_item_id];
$this->db->sql_query($sql); $this->db->sql_query($sql);
} }
$new_id++; $new_id++;
@ -616,7 +610,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
{ {
$sql = 'UPDATE ' . $this->table_name . ' $sql = 'UPDATE ' . $this->table_name . '
SET ' . $this->db->sql_build_array('UPDATE', array($this->column_right_id => $new_id)) . ' SET ' . $this->db->sql_build_array('UPDATE', array($this->column_right_id => $new_id)) . '
WHERE ' . $this->column_item_id . ' = ' . $row[$this->column_item_id]; WHERE ' . $this->column_item_id . ' = ' . (int) $row[$this->column_item_id];
$this->db->sql_query($sql); $this->db->sql_query($sql);
} }
$new_id++; $new_id++;

4
phpBB/includes/nestedset/forum.php
View file

@ -67,7 +67,7 @@ class phpbb_nestedset_forum extends phpbb_nestedset_base
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function move_children(phpbb_nestedset_item_interface $current_parent, phpbb_nestedset_item_interface $new_parent) public function move_children(array $current_parent, array $new_parent)
{ {
while (!$this->lock->acquire()) while (!$this->lock->acquire())
{ {
@ -92,7 +92,7 @@ class phpbb_nestedset_forum extends phpbb_nestedset_base
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function set_parent(phpbb_nestedset_item_interface $item, phpbb_nestedset_item_interface $new_parent) public function set_parent(array $item, array $new_parent)
{ {
while (!$this->lock->acquire()) while (!$this->lock->acquire())
{ {

46
phpBB/includes/nestedset/interface.php
View file

@ -20,7 +20,7 @@ interface phpbb_nestedset_interface
/** /**
* Insert an item into the nested set (also insert the rows into the table) * Insert an item into the nested set (also insert the rows into the table)
* *
* @param phpbb_nestedset_item_interface $item The item to be added * @param array $item The item to be added
* @return array Array with item data as set in the database * @return array Array with item data as set in the database
*/ */
public function insert(array $additional_data); public function insert(array $additional_data);
@ -28,96 +28,96 @@ interface phpbb_nestedset_interface
/** /**
* Add an item at the end of the nested set * Add an item at the end of the nested set
* *
* @param phpbb_nestedset_item_interface $item The item to be added * @param array $item The item to be added
* @return bool True if the item was added * @return bool True if the item was added
*/ */
public function add(phpbb_nestedset_item_interface $item); public function add(array $item);
/** /**
* Remove an item from the nested set * Remove an item from the nested set
* *
* Also removes all subitems from the nested set * Also removes all subitems from the nested set
* *
* @param phpbb_nestedset_item_interface $item The item to be removed * @param array $item The item to be removed
* @return array Items that have been removed * @return array Items that have been removed
*/ */
public function remove(phpbb_nestedset_item_interface $item); public function remove(array $item);
/** /**
* Delete an item from the nested set (also deletes the rows form the table) * Delete an item from the nested set (also deletes the rows form the table)
* *
* Also deletes all subitems from the nested set * Also deletes all subitems from the nested set
* *
* @param phpbb_nestedset_item_interface $item The item to be deleted * @param array $item The item to be deleted
* @return array Items that have been deleted * @return array Items that have been deleted
*/ */
public function delete(phpbb_nestedset_item_interface $item); public function delete(array $item);
/** /**
* Move an item by a given delta * Move an item by a given delta
* *
* @param phpbb_nestedset_item_interface $item The item to be moved * @param array $item The item to be moved
* @param int $delta Number of steps to move this item, < 0 => down, > 0 => up * @param int $delta Number of steps to move this item, < 0 => down, > 0 => up
* @return bool True if the item was moved * @return bool True if the item was moved
*/ */
public function move(phpbb_nestedset_item_interface $item, $delta); public function move(array $item, $delta);
/** /**
* Move an item down by 1 * Move an item down by 1
* *
* @param phpbb_nestedset_item_interface $item The item to be moved * @param array $item The item to be moved
* @return bool True if the item was moved * @return bool True if the item was moved
*/ */
public function move_down(phpbb_nestedset_item_interface $item); public function move_down(array $item);
/** /**
* Move an item up by 1 * Move an item up by 1
* *
* @param phpbb_nestedset_item_interface $item The item to be moved * @param array $item The item to be moved
* @return bool True if the item was moved * @return bool True if the item was moved
*/ */
public function move_up(phpbb_nestedset_item_interface $item); public function move_up(array $item);
/** /**
* Moves all children of one item to another item * Moves all children of one item to another item
* *
* @param phpbb_nestedset_item_interface $current_parent The current parent item * @param array $current_parent The current parent item
* @param phpbb_nestedset_item_interface $new_parent The new parent item * @param array $new_parent The new parent item
* @return bool True if any items where moved * @return bool True if any items where moved
*/ */
public function move_children(phpbb_nestedset_item_interface $current_parent, phpbb_nestedset_item_interface $new_parent); public function move_children(array $current_parent, array $new_parent);
/** /**
* Set the parent item * Set the parent item
* *
* @param phpbb_nestedset_item_interface $item The item to be moved * @param array $item The item to be moved
* @param phpbb_nestedset_item_interface $new_parent The new parent item * @param array $new_parent The new parent item
* @return bool True if the parent was set successfully * @return bool True if the parent was set successfully
*/ */
public function set_parent(phpbb_nestedset_item_interface $item, phpbb_nestedset_item_interface $new_parent); public function set_parent(array $item, array $new_parent);
/** /**
* Get branch of the item * Get branch of the item
* *
* This method can return all parents, children or both of the given item * This method can return all parents, children or both of the given item
* *
* @param phpbb_nestedset_item_interface $item The item to get the branch from * @param array $item The item to get the branch from
* @param string $type One of all|parent|children * @param string $type One of all|parent|children
* @param bool $order_desc Order the items descending (most outer parent first) * @param bool $order_desc Order the items descending (most outer parent first)
* @param bool $include_item Should the given item be included in the list aswell * @param bool $include_item Should the given item be included in the list aswell
* @return array Array of items (containing all columns from the item table) * @return array Array of items (containing all columns from the item table)
* ID => Item data * ID => Item data
*/ */
public function get_branch_data(phpbb_nestedset_item_interface $item, $type, $order_desc, $include_item); public function get_branch_data(array $item, $type, $order_desc, $include_item);
/** /**
* Get base information of parent items * Get base information of parent items
* *
* @param phpbb_nestedset_item_interface $item The item to get the parents from * @param array $item The item to get the parents from
* @return array Array of items (containing basic columns from the item table) * @return array Array of items (containing basic columns from the item table)
* ID => Item data * ID => Item data
*/ */
public function get_parent_data(phpbb_nestedset_item_interface $item); public function get_parent_data(array $item);
/** /**
* Recalculate Nested Sets * Recalculate Nested Sets