Fixing issues found by Roly and me
This commit is contained in:
8
thirdparty/pear/DB.php
vendored
8
thirdparty/pear/DB.php
vendored
@@ -353,7 +353,7 @@ class DB
|
||||
* @see DB::parseDSN(), DB_common::setOption(), DB::isError()
|
||||
* @access public
|
||||
*/
|
||||
function &connect($dsn, $options = array())
|
||||
public static function &connect($dsn, $options = array())
|
||||
{
|
||||
$dsninfo = DB::parseDSN($dsn);
|
||||
$dsninfo['phptype'] = $dsninfo['phptype'] === 'mysql' ? 'mysqli' : $dsninfo['phptype'];
|
||||
@@ -427,7 +427,7 @@ class DB
|
||||
*
|
||||
* @access public
|
||||
*/
|
||||
function isError($value)
|
||||
public static function isError($value)
|
||||
{
|
||||
return is_a($value, 'DB_Error');
|
||||
}
|
||||
@@ -569,7 +569,7 @@ class DB
|
||||
*
|
||||
* @author Tomas V.V.Cox <cox@idecnet.com>
|
||||
*/
|
||||
function parseDSN($dsn)
|
||||
public static function parseDSN($dsn)
|
||||
{
|
||||
$parsed = array(
|
||||
'phptype' => false,
|
||||
@@ -703,7 +703,7 @@ class DB
|
||||
* @return boolean true if the extension was already or successfully
|
||||
* loaded, false if it could not be loaded
|
||||
*/
|
||||
function assertExtension($name)
|
||||
public static function assertExtension($name)
|
||||
{
|
||||
if (!extension_loaded($name)) {
|
||||
$dlext = OS_WINDOWS ? '.dll' : '.so';
|
||||
|
||||
2
thirdparty/pear/DB/mysqli.php
vendored
2
thirdparty/pear/DB/mysqli.php
vendored
@@ -117,7 +117,7 @@ class DB_mysqli extends DB_common
|
||||
*/
|
||||
function __construct()
|
||||
{
|
||||
$this->DB_common();
|
||||
parent::__construct();
|
||||
$this->phptype = 'mysqli';
|
||||
$this->dbsyntax = 'mysqli';
|
||||
$this->features = array(
|
||||
|
||||
2
thirdparty/pear/DB/oci8.php
vendored
2
thirdparty/pear/DB/oci8.php
vendored
@@ -67,7 +67,7 @@ class DB_oci8 extends DB_common
|
||||
|
||||
function __construct()
|
||||
{
|
||||
$this->DB_common();
|
||||
parent::__construct();
|
||||
$this->phptype = 'oci8';
|
||||
$this->dbsyntax = 'oci8';
|
||||
$this->features = array(
|
||||
|
||||
2
thirdparty/pear/DB/odbc.php
vendored
2
thirdparty/pear/DB/odbc.php
vendored
@@ -52,7 +52,7 @@ class DB_odbc extends DB_common
|
||||
|
||||
function __construct()
|
||||
{
|
||||
$this->DB_common();
|
||||
parent::__construct();
|
||||
$this->phptype = 'odbc';
|
||||
$this->dbsyntax = 'sql92';
|
||||
$this->features = array(
|
||||
|
||||
2
thirdparty/pear/DB/pgsql.php
vendored
2
thirdparty/pear/DB/pgsql.php
vendored
@@ -53,7 +53,7 @@ class DB_pgsql extends DB_common
|
||||
|
||||
function __construct()
|
||||
{
|
||||
$this->DB_common();
|
||||
parent::__construct();
|
||||
$this->phptype = 'pgsql';
|
||||
$this->dbsyntax = 'pgsql';
|
||||
$this->features = array(
|
||||
|
||||
Reference in New Issue
Block a user