3 files changed, 17 insertions, 35 deletions
diff --git a/phpBB/phpbb/config/config.php b/phpBB/phpbb/config/config.php
index 4b533dd55c..d37922acf1 100644
--- a/phpBB/phpbb/config/config.php
+++ b/phpBB/phpbb/config/config.php
@@ -7,19 +7,13 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\config;
 
 /**
 * Configuration container class
 * @package phpBB3
 */
-class phpbb_config implements ArrayAccess, IteratorAggregate, Countable
+class config implements \ArrayAccess, \IteratorAggregate, \Countable
 {
 	/**
 	* The configuration data
@@ -44,7 +38,7 @@ class phpbb_config implements ArrayAccess, IteratorAggregate, Countable
 	*/
 	public function getIterator()
 	{
-		return new ArrayIterator($this->config);
+		return new \ArrayIterator($this->config);
 	}
 
 	/**
@@ -90,7 +84,7 @@ class phpbb_config implements ArrayAccess, IteratorAggregate, Countable
 	*/
 	public function offsetUnset($key)
 	{
-		trigger_error('Config values have to be deleted explicitly with the phpbb_config::delete($key) method.', E_USER_ERROR);
+		trigger_error('Config values have to be deleted explicitly with the \phpbb\config\config::delete($key) method.', E_USER_ERROR);
 	}
 
 	/**
diff --git a/phpBB/phpbb/config/db.php b/phpBB/phpbb/config/db.php
index b18369a479..ea84a9f873 100644
--- a/phpBB/phpbb/config/db.php
+++ b/phpBB/phpbb/config/db.php
@@ -7,29 +7,23 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\config;
 
 /**
 * Configuration container class
 * @package phpBB3
 */
-class phpbb_config_db extends phpbb_config
+class db extends \phpbb\config\config
 {
 	/**
 	* Cache instance
-	* @var phpbb_cache_driver_interface
+	* @var \phpbb\cache\driver\driver_interface
 	*/
 	protected $cache;
 
 	/**
 	* Database connection
-	* @var phpbb_db_driver
+	* @var \phpbb\db\driver\driver_interface
 	*/
 	protected $db;
 
@@ -42,11 +36,11 @@ class phpbb_config_db extends phpbb_config
 	/**
 	* Creates a configuration container with a default set of values
 	*
-	* @param phpbb_db_driver              $db    Database connection
-	* @param phpbb_cache_driver_interface $cache Cache instance
+	* @param \phpbb\db\driver\driver_interface    $db    Database connection
+	* @param \phpbb\cache\driver\driver_interface $cache Cache instance
 	* @param string                       $table Configuration table name
 	*/
-	public function __construct(phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $table)
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\cache\driver\driver_interface $cache, $table)
 	{
 		$this->db = $db;
 		$this->cache = $cache;
diff --git a/phpBB/phpbb/config/db_text.php b/phpBB/phpbb/config/db_text.php
index b365cb5c77..250a2ec7de 100644
--- a/phpBB/phpbb/config/db_text.php
+++ b/phpBB/phpbb/config/db_text.php
@@ -7,26 +7,20 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\config;
 
 /**
 * Manages configuration options with an arbitrary length value stored in a TEXT
-* column. In constrast to class phpbb_config_db, values are never cached and
+* column. In constrast to class \phpbb\config\db, values are never cached and
 * prefetched, but every get operation sends a query to the database.
 *
 * @package phpBB3
 */
-class phpbb_config_db_text
+class db_text
 {
 	/**
 	* Database connection
-	* @var phpbb_db_driver
+	* @var \phpbb\db\driver\driver_interface
 	*/
 	protected $db;
 
@@ -37,10 +31,10 @@ class phpbb_config_db_text
 	protected $table;
 
 	/**
-	* @param phpbb_db_driver $db        Database connection
+	* @param \phpbb\db\driver\driver_interface $db        Database connection
 	* @param string          $table     Table name
 	*/
-	public function __construct(phpbb_db_driver $db, $table)
+	public function __construct(\phpbb\db\driver\driver_interface $db, $table)
 	{
 		$this->db = $db;
 		$this->table = $this->db->sql_escape($table);