mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-28 10:40:28 +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/db/driver/driver.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\db\driver;
/**
* @ignore
*/
@@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Database Abstraction Layer
* @package dbal
*/
class phpbb_db_driver
class driver
{
var $db_connect_id;
var $query_result;
@@ -272,7 +274,7 @@ class phpbb_db_driver
* Correctly adjust LIKE expression for special characters
* Some DBMS are handling them in a different way
*
* @param string $expression The expression to use. Every wildcard is escaped, except $this->any_char and $this->one_char
* @param string $expression The expression to use. Every wildcard is escaped, \except $this->any_char and $this->one_char
* @return string LIKE expression including the keyword!
*/
function sql_like_expression($expression)
@@ -450,7 +452,7 @@ class phpbb_db_driver
* @param string $field name of the sql column that shall be compared
* @param array $array array of values that are allowed (IN) or not allowed (NOT IN)
* @param bool $negate true for NOT IN (), false for IN () (default)
* @param bool $allow_empty_set If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false.
* @param bool $allow_empty_set If true, \allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false.
*/
function sql_in_set($field, $array, $negate = false, $allow_empty_set = false)
{

4
phpBB/phpbb/db/driver/firebird.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\db\driver;
/**
* @ignore
*/
@@ -20,7 +22,7 @@ if (!defined('IN_PHPBB'))
* Minimum Requirement is Firebird 2.1
* @package dbal
*/
class phpbb_db_driver_firebird extends phpbb_db_driver
class firebird extends \phpbb\db\driver\driver
{
var $last_query_text = '';
var $service_handle = false;

4
phpBB/phpbb/db/driver/mssql.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\db\driver;
/**
* @ignore
*/
@@ -20,7 +22,7 @@ if (!defined('IN_PHPBB'))
* Minimum Requirement is MSSQL 2000+
* @package dbal
*/
class phpbb_db_driver_mssql extends phpbb_db_driver
class mssql extends \phpbb\db\driver\driver
{
var $connect_error = '';

4
phpBB/phpbb/db/driver/mssql_base.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\db\driver;
/**
* @ignore
*/
@@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* MSSQL Database Base Abstraction Layer
* @package dbal
*/
abstract class phpbb_db_driver_mssql_base extends phpbb_db_driver
abstract class mssql_base extends \phpbb\db\driver\driver
{
/**
* {@inheritDoc}

4
phpBB/phpbb/db/driver/mssql_odbc.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\db\driver;
/**
* @ignore
*/
@@ -26,7 +28,7 @@ if (!defined('IN_PHPBB'))
*
* @package dbal
*/
class phpbb_db_driver_mssql_odbc extends phpbb_db_driver_mssql_base
class mssql_odbc extends \phpbb\db\driver\mssql_base
{
var $last_query_text = '';
var $connect_error = '';

6
phpBB/phpbb/db/driver/mssqlnative.php
View File

@@ -11,6 +11,8 @@
*
*/
namespace phpbb\db\driver;
/**
* @ignore
*/
@@ -56,7 +58,7 @@ class result_mssqlnative
{
if (is_array($value))
{
$obj->$key = new stdClass();
$obj->$key = new \stdClass();
array_to_obj($value, $obj->$key);
}
else
@@ -191,7 +193,7 @@ class result_mssqlnative
/**
* @package dbal
*/
class phpbb_db_driver_mssqlnative extends phpbb_db_driver_mssql_base
class mssqlnative extends \phpbb\db\driver\mssql_base
{
var $m_insert_id = NULL;
var $last_query_text = '';

4
phpBB/phpbb/db/driver/mysql.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\db\driver;
/**
* @ignore
*/
@@ -24,7 +26,7 @@ if (!defined('IN_PHPBB'))
* MySQL 5.0+
* @package dbal
*/
class phpbb_db_driver_mysql extends phpbb_db_driver_mysql_base
class mysql extends \phpbb\db\driver\mysql_base
{
var $multi_insert = true;
var $connect_error = '';

4
phpBB/phpbb/db/driver/mysql_base.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\db\driver;
/**
* @ignore
*/
@@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Abstract MySQL Database Base Abstraction Layer
* @package dbal
*/
abstract class phpbb_db_driver_mysql_base extends phpbb_db_driver
abstract class mysql_base extends \phpbb\db\driver\driver
{
/**
* {@inheritDoc}

4
phpBB/phpbb/db/driver/mysqli.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\db\driver;
/**
* @ignore
*/
@@ -21,7 +23,7 @@ if (!defined('IN_PHPBB'))
* MySQL 4.1+ or MySQL 5.0+
* @package dbal
*/
class phpbb_db_driver_mysqli extends phpbb_db_driver_mysql_base
class mysqli extends \phpbb\db\driver\mysql_base
{
var $multi_insert = true;
var $connect_error = '';

4
phpBB/phpbb/db/driver/oracle.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\db\driver;
/**
* @ignore
*/
@@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Oracle Database Abstraction Layer
* @package dbal
*/
class phpbb_db_driver_oracle extends phpbb_db_driver
class oracle extends \phpbb\db\driver\driver
{
var $last_query_text = '';
var $connect_error = '';

8
phpBB/phpbb/db/driver/postgres.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\db\driver;
/**
* @ignore
*/
@@ -20,7 +22,7 @@ if (!defined('IN_PHPBB'))
* Minimum Requirement is Version 7.3+
* @package dbal
*/
class phpbb_db_driver_postgres extends phpbb_db_driver
class postgres extends \phpbb\db\driver\driver
{
var $last_query_text = '';
var $connect_error = '';
@@ -84,7 +86,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
$this->connect_error = 'pg_pconnect function does not exist, is pgsql extension installed?';
return $this->sql_error('');
}
$collector = new phpbb_error_collector;
$collector = new \phpbb\error_collector;
$collector->install();
$this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW);
}
@@ -95,7 +97,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
$this->connect_error = 'pg_connect function does not exist, is pgsql extension installed?';
return $this->sql_error('');
}
$collector = new phpbb_error_collector;
$collector = new \phpbb\error_collector;
$collector->install();
$this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW);
}

4
phpBB/phpbb/db/driver/sqlite.php
View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb\db\driver;
/**
* @ignore
*/
@@ -20,7 +22,7 @@ if (!defined('IN_PHPBB'))
* Minimum Requirement: 2.8.2+
* @package dbal
*/
class phpbb_db_driver_sqlite extends phpbb_db_driver
class sqlite extends \phpbb\db\driver\driver
{
var $connect_error = '';