[MediaWiki-commits] [Gerrit] Remove unused XMLReader2 class - change (mediawiki/core)

2014-07-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove unused XMLReader2 class
..


Remove unused XMLReader2 class

Undocumented and unused within core. Was previously used in WikiImporter,
but that use was removed in r81437.

Change-Id: I45f4ff3fae19a7d9c1a0dacb2e02d53ee4bdaefb
---
M RELEASE-NOTES-1.24
M includes/AutoLoader.php
M includes/Import.php
3 files changed, 1 insertion(+), 25 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index cd24ef0..3354957 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -321,6 +321,7 @@
 * HistoryPage - Use HistoryAction directly
 * RawPage - Use RawAction directly
 * StubContLang - Use Language::factory() instead
+* XMLReader2 - Use XMLReader directly
 
 == Compatibility ==
 
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index f35b380..ab5af1b 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -193,7 +193,6 @@
'Xml' = 'includes/Xml.php',
'XmlDumpWriter' = 'includes/Export.php',
'XmlJsCode' = 'includes/Xml.php',
-   'XMLReader2' = 'includes/Import.php',
'XmlSelect' = 'includes/Xml.php',
 
# includes/actions
diff --git a/includes/Import.php b/includes/Import.php
index 8eab3be..2eb5667 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -1050,30 +1050,6 @@
}
 }
 
-class XMLReader2 extends XMLReader {
-
-   /**
-* @return bool|string
-*/
-   function nodeContents() {
-   if ( $this-isEmptyElement ) {
-   return ;
-   }
-   $buffer = ;
-   while ( $this-read() ) {
-   switch ( $this-nodeType ) {
-   case XmlReader::TEXT:
-   case XmlReader::SIGNIFICANT_WHITESPACE:
-   $buffer .= $this-value;
-   break;
-   case XmlReader::END_ELEMENT:
-   return $buffer;
-   }
-   }
-   return $this-close();
-   }
-}
-
 /**
  * @todo document (e.g. one-sentence class description).
  * @ingroup SpecialPage

-- 
To view, visit https://gerrit.wikimedia.org/r/148958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I45f4ff3fae19a7d9c1a0dacb2e02d53ee4bdaefb
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO at.li...@live.com.au
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove unused XMLReader2 class - change (mediawiki/core)

2014-07-24 Thread TTO (Code Review) 
TTO has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/148958

Change subject: Remove unused XMLReader2 class
..

Remove unused XMLReader2 class

Undocumented and unused within core. Was previously used in WikiImporter,
but that use was removed in r81437.

Change-Id: I45f4ff3fae19a7d9c1a0dacb2e02d53ee4bdaefb
---
M RELEASE-NOTES-1.24
M includes/AutoLoader.php
M includes/Import.php
3 files changed, 1 insertion(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/58/148958/1

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 6d13c91..a08e4f6 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -316,6 +316,7 @@
 * HistoryPage - Use HistoryAction directly
 * RawPage - Use RawAction directly
 * StubContLang - Use Language::factory() instead
+* XMLReader2 - Use XMLReader directly
 
 == Compatibility ==
 
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 1393685..159ae62 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -193,7 +193,6 @@
'Xml' = 'includes/Xml.php',
'XmlDumpWriter' = 'includes/Export.php',
'XmlJsCode' = 'includes/Xml.php',
-   'XMLReader2' = 'includes/Import.php',
'XmlSelect' = 'includes/Xml.php',
 
# includes/actions
diff --git a/includes/Import.php b/includes/Import.php
index 6aab157..0516b83 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -1050,30 +1050,6 @@
}
 }
 
-class XMLReader2 extends XMLReader {
-
-   /**
-* @return bool|string
-*/
-   function nodeContents() {
-   if ( $this-isEmptyElement ) {
-   return ;
-   }
-   $buffer = ;
-   while ( $this-read() ) {
-   switch ( $this-nodeType ) {
-   case XmlReader::TEXT:
-   case XmlReader::SIGNIFICANT_WHITESPACE:
-   $buffer .= $this-value;
-   break;
-   case XmlReader::END_ELEMENT:
-   return $buffer;
-   }
-   }
-   return $this-close();
-   }
-}
-
 /**
  * @todo document (e.g. one-sentence class description).
  * @ingroup SpecialPage

-- 
To view, visit https://gerrit.wikimedia.org/r/148958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45f4ff3fae19a7d9c1a0dacb2e02d53ee4bdaefb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO at.li...@live.com.au

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits