From b2c4dcd54bb5d97db9d02b9434ce16ae773d2f81 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sun, 3 Oct 2010 08:14:38 +0000 Subject: [PATCH] Removed forward comapt code with 5.1.0+ and modified code to use the new version --- maintenance/backupPrefetch.inc | 50 ++++------------------------------ 1 file changed, 6 insertions(+), 44 deletions(-) diff --git a/maintenance/backupPrefetch.inc b/maintenance/backupPrefetch.inc index 14f78a0bcb..2d7b8a9e15 100644 --- a/maintenance/backupPrefetch.inc +++ b/maintenance/backupPrefetch.inc @@ -6,44 +6,6 @@ * @ingrouo Maintenance */ -// Some smart guy removed XMLReader's global constants from PHP 5.1 -// and replaced them with class constants. Breaking source compatibility -// is SUPER awesome, and I love languages which do this constantly! -$xmlReaderConstants = array( - "NONE", - "ELEMENT", - "ATTRIBUTE", - "TEXT", - "CDATA", - "ENTITY_REF", - "ENTITY", - "PI", - "COMMENT", - "DOC", - "DOC_TYPE", - "DOC_FRAGMENT", - "NOTATION", - "WHITESPACE", - "SIGNIFICANT_WHITESPACE", - "END_ELEMENT", - "END_ENTITY", - "XML_DECLARATION", - "LOADDTD", - "DEFAULTATTRS", - "VALIDATE", - "SUBST_ENTITIES" ); -foreach ( $xmlReaderConstants as $name ) { - $fullName = "XMLREADER_$name"; - $newName = "XMLReader::$name"; - if ( !defined( $fullName ) ) { - if ( defined( $newName ) ) { - define( $fullName, constant( $newName ) ); - } else { - // broken or missing the extension... - } - } -} - /** * Readahead helper for making large MediaWiki data dumps; * reads in a previous XML dump to sequentially prefetch text @@ -155,11 +117,11 @@ class BaseDump { return false; } while ( $this->reader->read() ) { - if ( $this->reader->nodeType == XMLREADER_ELEMENT && + if ( $this->reader->nodeType == XMLReader::ELEMENT && $this->reader->name == $name ) { return true; } - if ( $this->reader->nodeType == XMLREADER_END_ELEMENT && + if ( $this->reader->nodeType == XMLReader::END_ELEMENT && $this->reader->name == $parent ) { $this->debug( "BaseDump::skipTo found searching for <$name>" ); return false; @@ -186,12 +148,12 @@ class BaseDump { $buffer = ""; while ( $this->reader->read() ) { switch( $this->reader->nodeType ) { - case XMLREADER_TEXT: -// case XMLREADER_WHITESPACE: - case XMLREADER_SIGNIFICANT_WHITESPACE: + case XMLReader::TEXT: +// case XMLReader::WHITESPACE: + case XMLReader::SIGNIFICANT_WHITESPACE: $buffer .= $this->reader->value; break; - case XMLREADER_END_ELEMENT: + case XMLReader::END_ELEMENT: return $buffer; } } -- 2.20.1