mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix php4 legacy calls 

Reviewed-by: Robin Appelman
Reviewboard: http://git.reviewboard.kde.org/r/101549/
This commit is contained in:
Thomas Zander 2011-06-08 23:12:06 +02:00
parent 1ea43dd7f9
commit 80194daec7
4 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
3dparty/MDB2.php
View File

@ -639,7 +639,7 @@ class MDB2
*/ */
static function isError($data, $code = null) static function isError($data, $code = null)
{ {
if (is_a($data, 'MDB2_Error')) { if ($data instanceof MDB2_Error) {
if (is_null($code)) { if (is_null($code)) {
return true; return true;
} elseif (is_string($code)) { } elseif (is_string($code)) {
@ -666,7 +666,7 @@ class MDB2
*/ */
static function isConnection($value) static function isConnection($value)
{ {
return is_a($value, 'MDB2_Driver_Common'); return ($value instanceof MDB2_Driver_Common);
} }
// }}} // }}}
@ -683,7 +683,7 @@ class MDB2
*/ */
static function isResult($value) static function isResult($value)
{ {
return is_a($value, 'MDB2_Result'); return $value instanceof MDB2_Result;
} }
// }}} // }}}
@ -700,7 +700,7 @@ class MDB2
*/ */
static function isResultCommon($value) static function isResultCommon($value)
{ {
return is_a($value, 'MDB2_Result_Common'); return ($value instanceof MDB2_Result_Common);
} }
// }}} // }}}
@ -717,7 +717,7 @@ class MDB2
*/ */
static function isStatement($value) static function isStatement($value)
{ {
return is_a($value, 'MDB2_Statement_Common'); return $value instanceof MDB2_Statement_Common;
} }
// }}} // }}}

9
3dparty/MDB2/Schema/Parser.php
View File

@ -127,13 +127,6 @@ class MDB2_Schema_Parser extends XML_Parser
$this->val =new MDB2_Schema_Validate($fail_on_invalid_names, $valid_types, $force_defaults); $this->val =new MDB2_Schema_Validate($fail_on_invalid_names, $valid_types, $force_defaults);
} }
function MDB2_Schema_Parser($variables, $fail_on_invalid_names = true,
$structure = false, $valid_types = array(),
$force_defaults = true)
{
$this->__construct($variables, $fail_on_invalid_names, $structure, $valid_types, $force_defaults);
}
function startHandler($xp, $element, $attribs) function startHandler($xp, $element, $attribs)
{ {
if (strtolower($element) == 'variable') { if (strtolower($element) == 'variable') {
@ -503,7 +496,7 @@ class MDB2_Schema_Parser extends XML_Parser
$this->element = implode('-', $this->elements); $this->element = implode('-', $this->elements);
} }
function &raiseError($msg = null, $xmlecode = 0, $xp = null, $ecode = MDB2_SCHEMA_ERROR_PARSE,$a=null,$b=null,$c=null) function raiseError($msg = null, $xmlecode = 0, $xp = null, $ecode = MDB2_SCHEMA_ERROR_PARSE,$a=null,$b=null,$c=null)
{ {
if (is_null($this->error)) { if (is_null($this->error)) {
$error = ''; $error = '';

5
3dparty/MDB2/Schema/Validate.php
View File

@ -91,11 +91,6 @@ class MDB2_Schema_Validate
$this->force_defaults = $force_defaults; $this->force_defaults = $force_defaults;
} }
function MDB2_Schema_Validate($fail_on_invalid_names = true, $valid_types = array(), $force_defaults = true)
{
$this->__construct($fail_on_invalid_names, $valid_types, $force_defaults);
}
// }}} // }}}
// {{{ raiseError() // {{{ raiseError()

12
3dparty/PEAR.php
View File

@ -249,7 +249,7 @@ class PEAR
*/ */
static function isError($data, $code = null) static function isError($data, $code = null)
{ {
if (is_a($data, 'PEAR_Error')) { if ($data instanceof PEAR_Error) {
if (is_null($code)) { if (is_null($code)) {
return true; return true;
} elseif (is_string($code)) { } elseif (is_string($code)) {
@ -305,7 +305,7 @@ class PEAR
function setErrorHandling($mode = null, $options = null) function setErrorHandling($mode = null, $options = null)
{ {
if (isset($this) && is_a($this, 'PEAR')) { if (isset($this) && $this instanceof PEAR) {
$setmode = &$this->_default_error_mode; $setmode = &$this->_default_error_mode;
$setoptions = &$this->_default_error_options; $setoptions = &$this->_default_error_options;
} else { } else {
@ -557,7 +557,7 @@ class PEAR
$code = null, $code = null,
$userinfo = null) $userinfo = null)
{ {
if (isset($this) && is_a($this, 'PEAR')) { if (isset($this) && $this instanceof PEAR) {
return $this->raiseError($message, $code, null, null, $userinfo); return $this->raiseError($message, $code, null, null, $userinfo);
} else { } else {
return PEAR::raiseError($message, $code, null, null, $userinfo); return PEAR::raiseError($message, $code, null, null, $userinfo);
@ -653,7 +653,7 @@ class PEAR
function pushErrorHandling($mode, $options = null) function pushErrorHandling($mode, $options = null)
{ {
$stack = &$GLOBALS['_PEAR_error_handler_stack']; $stack = &$GLOBALS['_PEAR_error_handler_stack'];
if (isset($this) && is_a($this, 'PEAR')) { if (isset($this) && $this instanceof PEAR) {
$def_mode = &$this->_default_error_mode; $def_mode = &$this->_default_error_mode;
$def_options = &$this->_default_error_options; $def_options = &$this->_default_error_options;
} else { } else {
@ -662,7 +662,7 @@ class PEAR
} }
$stack[] = array($def_mode, $def_options); $stack[] = array($def_mode, $def_options);
if (isset($this) && is_a($this, 'PEAR')) { if (isset($this) && $this instanceof PEAR) {
$this->setErrorHandling($mode, $options); $this->setErrorHandling($mode, $options);
} else { } else {
PEAR::setErrorHandling($mode, $options); PEAR::setErrorHandling($mode, $options);
@ -687,7 +687,7 @@ class PEAR
array_pop($stack); array_pop($stack);
list($mode, $options) = $stack[sizeof($stack) - 1]; list($mode, $options) = $stack[sizeof($stack) - 1];
array_pop($stack); array_pop($stack);
if (isset($this) && is_a($this, 'PEAR')) { if (isset($this) && $this instanceof PEAR) {
$this->setErrorHandling($mode, $options); $this->setErrorHandling($mode, $options);
} else { } else {
PEAR::setErrorHandling($mode, $options); PEAR::setErrorHandling($mode, $options);