mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-29 11:10:18 +02:00
Code Issues Releases Wiki Activity

[ticket/11700] Move all recent code to namespaces

Browse Source 
PHPBB3-11700
This commit is contained in:
Nils Adermann
2013-09-10 14:01:09 +02:00
parent 196e1813cd
commit b95fdacdd3
420 changed files with 2316 additions and 1840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/phpbb/config/config.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\config;
/**
* @ignore
*/
@@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Configuration container class
* @package phpBB3
*/
class phpbb_config implements ArrayAccess, IteratorAggregate, Countable
class config implements \ArrayAccess, \IteratorAggregate, \Countable
{
/**
* The configuration data
@@ -44,7 +46,7 @@ class phpbb_config implements ArrayAccess, IteratorAggregate, Countable
*/
public function getIterator()
{
return new ArrayIterator($this->config);
return new \ArrayIterator($this->config);
}
/**
@@ -90,7 +92,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);
}
/**

16
phpBB/phpbb/config/db.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\config;
/**
* @ignore
*/
@@ -19,17 +21,17 @@ if (!defined('IN_PHPBB'))
* Configuration container class
* @package phpBB3
*/
class phpbb_config_db extends phpbb_config
class db extends \phpbb\config\config
{
/**
* Cache instance
* @var phpbb_cache_driver_driver_interface
* @var \phpbb\cache\driver\driver_interface
*/
protected $cache;
/**
* Database connection
* @var phpbb_db_driver
* @var \phpbb\db\driver\driver
*/
protected $db;
@@ -42,11 +44,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_driver_interface $cache Cache instance
* @param \phpbb\db\driver\driver $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_driver_interface $cache, $table)
public function __construct(\phpbb\db\driver\driver $db, \phpbb\cache\driver\driver_interface $cache, $table)
{
$this->db = $db;
$this->cache = $cache;
@@ -176,7 +178,7 @@ class phpbb_config_db extends phpbb_config
/**
* Increments an integer config value directly in the database.
*
* Using this method instead of setting the new value directly avoids race
* Using this method instead of setting the new \value directly avoids race
* conditions and unlike set_atomic it cannot fail.
*
* @param string $key The configuration option's name

12
phpBB/phpbb/config/db_text.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\config;
/**
* @ignore
*/
@@ -17,16 +19,16 @@ if (!defined('IN_PHPBB'))
/**
* 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
*/
protected $db;
@@ -37,10 +39,10 @@ class phpbb_config_db_text
protected $table;
/**
* @param phpbb_db_driver $db Database connection
* @param \phpbb\db\driver\driver $db Database connection
* @param string $table Table name
*/
public function __construct(phpbb_db_driver $db, $table)
public function __construct(\phpbb\db\driver\driver $db, $table)
{
$this->db = $db;
$this->table = $this->db->sql_escape($table);