aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-04-30 18:24:54 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-04-30 18:24:54 +0200
commit2f54a63b0fb998c84730e21a3af4150281c22cab (patch)
tree15d09cc72fdd45fe3c53deb25016225fc1de6bc6
parent98e6207c35910bf9761433e62ca5fe5af3459873 (diff)
downloadforums-2f54a63b0fb998c84730e21a3af4150281c22cab.tar
forums-2f54a63b0fb998c84730e21a3af4150281c22cab.tar.gz
forums-2f54a63b0fb998c84730e21a3af4150281c22cab.tar.bz2
forums-2f54a63b0fb998c84730e21a3af4150281c22cab.tar.xz
forums-2f54a63b0fb998c84730e21a3af4150281c22cab.zip
[ticket/11495] Fix more grammar issues in doc blocks
PHPBB3-11495
-rw-r--r--phpBB/includes/tree/interface.php16
-rw-r--r--tests/tree/nestedset_forum_base.php2
2 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index 546e00ed06..2eb40b066c 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -90,8 +90,8 @@ interface phpbb_tree_interface
/**
* Get all items that are either ancestors or descendants of the item
*
- * @param int $item_id The item to get the ancestors/descendants from
- * @param bool $order_asc Order the items ascending (most outer ancestor first)
+ * @param int $item_id The item id the ancestors/descendants should be retrieved from
+ * @param bool $order_asc Order the items ascendingly (most outer ancestor first)
* @param bool $include_item Should the item matching the given item id be included in the list as well
* @return array Array of items (containing all columns from the item table)
* ID => Item data
@@ -99,10 +99,10 @@ interface phpbb_tree_interface
public function get_path_and_subtree_data($item_id, $order_asc, $include_item);
/**
- * Get all ancestors of the item
+ * Get all of the item's ancestors
*
- * @param int $item_id The item id to get the ancestors from
- * @param bool $order_asc Order the items ascending (most outer ancestor first)
+ * @param int $item_id The item id the ancestors should be retrieved from
+ * @param bool $order_asc Order the items ascendingly (most outer ancestor first)
* @param bool $include_item Should the item matching the given item id be included in the list as well
* @return array Array of items (containing all columns from the item table)
* ID => Item data
@@ -110,10 +110,10 @@ interface phpbb_tree_interface
public function get_path_data($item_id, $order_asc, $include_item);
/**
- * Get all descendants of the item
+ * Get all of the item's descendants
*
- * @param int $item_id The item id to get the descendants from
- * @param bool $order_asc Order the items ascending
+ * @param int $item_id The item id the descendants should be retrieved from
+ * @param bool $order_asc Order the items ascendingly
* @param bool $include_item Should the item matching the given item id be included in the list as well
* @return array Array of items (containing all columns from the item table)
* ID => Item data
diff --git a/tests/tree/nestedset_forum_base.php b/tests/tree/nestedset_forum_base.php
index b9d42fb51d..776e822280 100644
--- a/tests/tree/nestedset_forum_base.php
+++ b/tests/tree/nestedset_forum_base.php
@@ -34,7 +34,7 @@ class phpbb_tests_tree_nestedset_forum_base extends phpbb_database_test_case
10 => array('forum_id' => 10, 'parent_id' => 9, 'user_id' => 0, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'),
11 => array('forum_id' => 11, 'parent_id' => 7, 'user_id' => 0, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'),
- // Unexisting forums
+ // Non-existent forums
0 => array('forum_id' => 0, 'parent_id' => 0, 'user_id' => 0, 'left_id' => 0, 'right_id' => 0, 'forum_parents' => 'a:0:{}'),
200 => array('forum_id' => 200, 'parent_id' => 0, 'user_id' => 0, 'left_id' => 0, 'right_id' => 0, 'forum_parents' => 'a:0:{}'),
);