4 files changed, 53 insertions, 53 deletions
diff --git a/phpBB/phpbb/groupposition/exception.php b/phpBB/phpbb/groupposition/exception.php
index f43502235d..956c7238f2 100644
--- a/phpBB/phpbb/groupposition/exception.php
+++ b/phpBB/phpbb/groupposition/exception.php
@@ -1,17 +1,18 @@
 <?php
 /**
 *
-* @package groupposition
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
 namespace phpbb\groupposition;
 
-/**
-* @package groupposition
-*/
 class exception extends \Exception
 {
 }
diff --git a/phpBB/phpbb/groupposition/groupposition_interface.php b/phpBB/phpbb/groupposition/groupposition_interface.php
index 9785172a00..3bd3fcce90 100644
--- a/phpBB/phpbb/groupposition/groupposition_interface.php
+++ b/phpBB/phpbb/groupposition/groupposition_interface.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -13,8 +17,6 @@ namespace phpbb\groupposition;
 * Interface to manage group positions in various places of phpbb
 *
 * The interface provides simple methods to add, delete and move a group
-*
-* @package phpBB3
 */
 interface groupposition_interface
 {
diff --git a/phpBB/phpbb/groupposition/legend.php b/phpBB/phpbb/groupposition/legend.php
index 47ba06c006..efea3389d4 100644
--- a/phpBB/phpbb/groupposition/legend.php
+++ b/phpBB/phpbb/groupposition/legend.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -14,8 +18,6 @@ namespace phpbb\groupposition;
 *
 * group_legend is an ascending list 1, 2, ..., n for groups which are displayed. 1 is the first group, n the last.
 * If the value is 0 (self::GROUP_DISABLED) the group is not displayed.
-*
-* @package phpBB3
 */
 class legend implements \phpbb\groupposition\groupposition_interface
 {
@@ -26,7 +28,7 @@ class legend implements \phpbb\groupposition\groupposition_interface
 
 	/**
 	* Database object
-	* @var \phpbb\db\driver\driver
+	* @var \phpbb\db\driver\driver_interface
 	*/
 	protected $db;
 
@@ -39,10 +41,10 @@ class legend implements \phpbb\groupposition\groupposition_interface
 	/**
 	* Constructor
 	*
-	* @param \phpbb\db\driver\driver	$db		Database object
+	* @param \phpbb\db\driver\driver_interface	$db		Database object
 	* @param \phpbb\user			$user	User object
 	*/
-	public function __construct(\phpbb\db\driver\driver $db, \phpbb\user $user)
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user $user)
 	{
 		$this->db = $db;
 		$this->user = $user;
@@ -51,7 +53,9 @@ class legend implements \phpbb\groupposition\groupposition_interface
 	/**
 	* Returns the group_legend for a given group, if the group exists.
 	*
-	* {@inheritDoc}
+	* @param	int		$group_id	group_id of the group to be selected
+	* @return	int			position of the group
+	* @throws \phpbb\groupposition\exception
 	*/
 	public function get_group_value($group_id)
 	{
@@ -74,7 +78,7 @@ class legend implements \phpbb\groupposition\groupposition_interface
 	/**
 	* Get number of groups, displayed on the legend
 	*
-	* {@inheritDoc}
+	* @return	int		value of the last item displayed
 	*/
 	public function get_group_count()
 	{
@@ -89,8 +93,6 @@ class legend implements \phpbb\groupposition\groupposition_interface
 	}
 
 	/**
-	* Adds a group by group_id
-	*
 	* {@inheritDoc}
 	*/
 	public function add_group($group_id)
@@ -116,7 +118,9 @@ class legend implements \phpbb\groupposition\groupposition_interface
 	/**
 	* Deletes a group by setting the field to self::GROUP_DISABLED and closing the gap in the list.
 	*
-	* {@inheritDoc}
+	* @param	int		$group_id		group_id of the group to be deleted
+	* @param	bool	$skip_group		Skip setting the value for this group, to save the query, when you need to update it anyway.
+	* @return	bool		True if the group was deleted successfully
 	*/
 	public function delete_group($group_id, $skip_group = false)
 	{
@@ -148,8 +152,6 @@ class legend implements \phpbb\groupposition\groupposition_interface
 	}
 
 	/**
-	* Moves a group up by group_id
-	*
 	* {@inheritDoc}
 	*/
 	public function move_up($group_id)
@@ -158,8 +160,6 @@ class legend implements \phpbb\groupposition\groupposition_interface
 	}
 
 	/**
-	* Moves a group down by group_id
-	*
 	* {@inheritDoc}
 	*/
 	public function move_down($group_id)
@@ -168,8 +168,6 @@ class legend implements \phpbb\groupposition\groupposition_interface
 	}
 
 	/**
-	* Moves a group up/down
-	*
 	* {@inheritDoc}
 	*/
 	public function move($group_id, $delta)
diff --git a/phpBB/phpbb/groupposition/teampage.php b/phpBB/phpbb/groupposition/teampage.php
index d934571ebc..2985c51525 100644
--- a/phpBB/phpbb/groupposition/teampage.php
+++ b/phpBB/phpbb/groupposition/teampage.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -13,8 +17,6 @@ namespace phpbb\groupposition;
 * Teampage group position class
 *
 * Teampage position is an ascending list 1, 2, ..., n for items which are displayed. 1 is the first item, n the last.
-*
-* @package phpBB3
 */
 class teampage implements \phpbb\groupposition\groupposition_interface
 {
@@ -30,7 +32,7 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 
 	/**
 	* Database object
-	* @var \phpbb\db\driver\driver
+	* @var \phpbb\db\driver\driver_interface
 	*/
 	protected $db;
 
@@ -49,11 +51,11 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 	/**
 	* Constructor
 	*
-	* @param \phpbb\db\driver\driver				$db		Database object
+	* @param \phpbb\db\driver\driver_interface				$db		Database object
 	* @param \phpbb\user						$user	User object
 	* @param \phpbb\cache\driver\driver_interface	$cache	Cache object
 	*/
-	public function __construct(\phpbb\db\driver\driver $db, \phpbb\user $user, \phpbb\cache\driver\driver_interface $cache)
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user $user, \phpbb\cache\driver\driver_interface $cache)
 	{
 		$this->db = $db;
 		$this->user = $user;
@@ -63,7 +65,9 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 	/**
 	* Returns the teampage position for a given group, if the group exists.
 	*
-	* {@inheritDoc}
+	* @param	int		$group_id	group_id of the group to be selected
+	* @return	int			position of the group
+	* @throws \phpbb\groupposition\exception
 	*/
 	public function get_group_value($group_id)
 	{
@@ -91,6 +95,7 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 	*
 	* @param	int		$group_id	group_id of the group to be selected
 	* @return	array			Data row of the group
+	* @throws \phpbb\groupposition\exception
 	*/
 	public function get_group_values($group_id)
 	{
@@ -118,6 +123,7 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 	*
 	* @param	int		$teampage_id	Teampage_id of the selected item
 	* @return	int			Teampage position of the item
+	* @throws \phpbb\groupposition\exception
 	*/
 	public function get_teampage_value($teampage_id)
 	{
@@ -142,6 +148,7 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 	*
 	* @param	int		$teampage_id	Teampage_id of the selected item
 	* @return	array			Teampage row of the item
+	* @throws \phpbb\groupposition\exception
 	*/
 	public function get_teampage_values($teampage_id)
 	{
@@ -163,8 +170,6 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 
 
 	/**
-	* Get number of items displayed
-	*
 	* {@inheritDoc}
 	*/
 	public function get_group_count()
@@ -180,8 +185,6 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 	}
 
 	/**
-	* Adds a group by group_id
-	*
 	* {@inheritDoc}
 	*/
 	public function add_group($group_id)
@@ -286,7 +289,9 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 	/**
 	* Deletes a group from the list and closes the gap in the position list.
 	*
-	* {@inheritDoc}
+	* @param	int		$group_id		group_id of the group to be deleted
+	* @param	bool	$skip_group		Skip setting the value for this group, to save the query, when you need to update it anyway.
+	* @return	bool		True if the group was deleted successfully
 	*/
 	public function delete_group($group_id, $skip_group = false)
 	{
@@ -345,8 +350,6 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 	}
 
 	/**
-	* Moves a group up by group_id
-	*
 	* {@inheritDoc}
 	*/
 	public function move_up($group_id)
@@ -357,7 +360,7 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 	/**
 	* Moves an item up by teampage_id
 	*
-	* @param	int		$group_id	group_id of the group to be moved
+	* @param	int		$teampage_id	teampage_id of the item to be move
 	* @return	bool		True if the group was moved successfully
 	*/
 	public function move_up_teampage($teampage_id)
@@ -366,8 +369,6 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 	}
 
 	/**
-	* Moves a group down by group_id
-	*
 	* {@inheritDoc}
 	*/
 	public function move_down($group_id)
@@ -376,9 +377,9 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 	}
 
 	/**
-	* Movesan item down by teampage_id
+	* Moves an item down by teampage_id
 	*
-	* @param	int		$group_id	group_id of the group to be moved
+	* @param	int		$teampage_id	teampage_id of the item to be moved
 	* @return	bool		True if the group was moved successfully
 	*/
 	public function move_down_teampage($teampage_id)
@@ -387,8 +388,6 @@ class teampage implements \phpbb\groupposition\groupposition_interface
 	}
 
 	/**
-	* Moves a group up/down
-	*
 	* {@inheritDoc}
 	*/
 	public function move($group_id, $delta)