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

fix strict errors in xml parser

This commit is contained in:
Robin Appelman 2011-04-17 11:18:17 +02:00
parent c5e270b453
commit fda445ab05
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@ class MDB2_Schema_Parser extends XML_Parser
{ {
// force ISO-8859-1 due to different defaults for PHP4 and PHP5 // force ISO-8859-1 due to different defaults for PHP4 and PHP5
// todo: this probably needs to be investigated some more andcleaned up // todo: this probably needs to be investigated some more andcleaned up
parent::XML_Parser('ISO-8859-1'); parent::__construct('ISO-8859-1');
$this->variables = $variables; $this->variables = $variables;
$this->structure = $structure; $this->structure = $structure;
@ -503,7 +503,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) 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 = '';

28
3dparty/XML/Parser.php
View File

@ -164,26 +164,6 @@ class XML_Parser extends PEAR
*/ */
var $_handlerObj; var $_handlerObj;
// }}}
// {{{ constructor
/**
* Creates an XML parser.
*
* This is needed for PHP4 compatibility, it will
* call the constructor, when a new instance is created.
*
* @param string $srcenc source charset encoding, use NULL (default) to use
* whatever the document specifies
* @param string $mode how this parser object should work, "event" for
* startelement/endelement-type events, "func"
* to have it call functions named after elements
* @param string $tgenc a valid target encoding
*/
function XML_Parser($srcenc = null, $mode = 'event', $tgtenc = null)
{
XML_Parser::__construct($srcenc, $mode, $tgtenc);
}
// }}} // }}}
/** /**
@ -560,7 +540,11 @@ class XML_Parser extends PEAR
* @param integer $ecode the error message code * @param integer $ecode the error message code
* @return XML_Parser_Error * @return XML_Parser_Error
**/ **/
function raiseError($msg = null, $ecode = 0) function raiseError($msg = null, $ecode = 0,$mode = null,
$options = null,
$userinfo = null,
$error_class = null,
$skipmsg = false)
{ {
$msg = !is_null($msg) ? $msg : $this->parser; $msg = !is_null($msg) ? $msg : $this->parser;
$err = new XML_Parser_Error($msg, $ecode); $err = new XML_Parser_Error($msg, $ecode);
@ -606,7 +590,7 @@ class XML_Parser extends PEAR
* *
* @abstract * @abstract
*/ */
function startHandler($xp, $elem, &$attribs) function startHandler($xp, $elem, $attribs)
{ {
return NULL; return NULL;
} }