4 files changed, 27 insertions, 51 deletions
diff --git a/phpBB/phpbb/groupposition/exception.php b/phpBB/phpbb/groupposition/exception.php
index e4ff09c703..9b55669524 100644
--- a/phpBB/phpbb/groupposition/exception.php
+++ b/phpBB/phpbb/groupposition/exception.php
@@ -3,21 +3,15 @@
 *
 * @package groupposition
 * @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\groupposition;
 
 /**
 * @package groupposition
 */
-class phpbb_groupposition_exception extends \Exception
+class exception extends \Exception
 {
 }
diff --git a/phpBB/phpbb/groupposition/interface.php b/phpBB/phpbb/groupposition/groupposition_interface.php
index eacc04e1a4..9785172a00 100644
--- a/phpBB/phpbb/groupposition/interface.php
+++ b/phpBB/phpbb/groupposition/groupposition_interface.php
@@ -7,13 +7,7 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\groupposition;
 
 /**
 * Interface to manage group positions in various places of phpbb
@@ -22,7 +16,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-interface phpbb_groupposition_interface
+interface groupposition_interface
 {
 	/**
 	* Returns the value for a given group, if the group exists.
@@ -32,7 +26,7 @@ interface phpbb_groupposition_interface
 	public function get_group_value($group_id);
 
 	/**
-	* Get number of groups displayed 
+	* Get number of groups displayed
 	*
 	* @return	int		value of the last item displayed
 	*/
diff --git a/phpBB/phpbb/groupposition/legend.php b/phpBB/phpbb/groupposition/legend.php
index 7fddadde99..42af005622 100644
--- a/phpBB/phpbb/groupposition/legend.php
+++ b/phpBB/phpbb/groupposition/legend.php
@@ -7,13 +7,7 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\groupposition;
 
 /**
 * Legend group position class
@@ -23,7 +17,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class phpbb_groupposition_legend implements phpbb_groupposition_interface
+class legend implements \phpbb\groupposition\groupposition_interface
 {
 	/**
 	* Group is not displayed
@@ -32,23 +26,23 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 
 	/**
 	* Database object
-	* @var phpbb_db_driver
+	* @var \phpbb\db\driver\driver_interface
 	*/
 	protected $db;
 
 	/**
 	* User object
-	* @var phpbb_user
+	* @var \phpbb\user
 	*/
 	protected $user;
 
 	/**
 	* Constructor
 	*
-	* @param phpbb_db_driver	$db		Database object
-	* @param phpbb_user			$user	User object
+	* @param \phpbb\db\driver\driver_interface	$db		Database object
+	* @param \phpbb\user			$user	User object
 	*/
-	public function __construct(phpbb_db_driver $db, phpbb_user $user)
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user $user)
 	{
 		$this->db = $db;
 		$this->user = $user;
@@ -71,7 +65,7 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 		if ($current_value === false)
 		{
 			// Group not found.
-			throw new phpbb_groupposition_exception('NO_GROUP');
+			throw new \phpbb\groupposition\exception('NO_GROUP');
 		}
 
 		return (int) $current_value;
diff --git a/phpBB/phpbb/groupposition/teampage.php b/phpBB/phpbb/groupposition/teampage.php
index 7c758199e7..4f1b102720 100644
--- a/phpBB/phpbb/groupposition/teampage.php
+++ b/phpBB/phpbb/groupposition/teampage.php
@@ -7,13 +7,7 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\groupposition;
 
 /**
 * Teampage group position class
@@ -22,7 +16,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class phpbb_groupposition_teampage implements phpbb_groupposition_interface
+class teampage implements \phpbb\groupposition\groupposition_interface
 {
 	/**
 	* Group is not displayed
@@ -36,30 +30,30 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 
 	/**
 	* Database object
-	* @var phpbb_db_driver
+	* @var \phpbb\db\driver\driver_interface
 	*/
 	protected $db;
 
 	/**
 	* User object
-	* @var phpbb_user
+	* @var \phpbb\user
 	*/
 	protected $user;
 
 	/**
 	* Cache object
-	* @var phpbb_cache_driver_interface
+	* @var \phpbb\cache\driver\driver_interface
 	*/
 	protected $cache;
 
 	/**
 	* Constructor
 	*
-	* @param phpbb_db_driver				$db		Database object
-	* @param phpbb_user						$user	User object
-	* @param phpbb_cache_driver_interface	$cache	Cache 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 $db, phpbb_user $user, phpbb_cache_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;
@@ -86,7 +80,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 		if ($row === false)
 		{
 			// Group not found.
-			throw new phpbb_groupposition_exception('NO_GROUP');
+			throw new \phpbb\groupposition\exception('NO_GROUP');
 		}
 
 		return (int) $row['teampage_position'];
@@ -113,7 +107,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 		if ($row === false)
 		{
 			// Group not found.
-			throw new phpbb_groupposition_exception('NO_GROUP');
+			throw new \phpbb\groupposition\exception('NO_GROUP');
 		}
 
 		return $row;
@@ -137,7 +131,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 		if ($current_value === false)
 		{
 			// Group not found.
-			throw new phpbb_groupposition_exception('NO_GROUP');
+			throw new \phpbb\groupposition\exception('NO_GROUP');
 		}
 
 		return (int) $current_value;
@@ -161,7 +155,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 		if ($row === false)
 		{
 			// Group not found.
-			throw new phpbb_groupposition_exception('NO_GROUP');
+			throw new \phpbb\groupposition\exception('NO_GROUP');
 		}
 
 		return $row;