From: Kunal Mehta <legoktm@member.fsf.org>
Date: Tue, 4 Oct 2016 17:56:35 +0000 (-0700)
Subject: Move utils/iterators/ into libs/
X-Git-Tag: 1.31.0-rc.0~5094^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=344cbdc645346358ae0e14afb0de57b75b6dde4f;p=lhc%2Fweb%2Fwiklou.git

Move utils/iterators/ into libs/

They have no dependency upon MediaWiki.

Change-Id: I58d59941cc7e1ba4fd5e265c8e30f59db66ed514
---

diff --git a/autoload.php b/autoload.php
index 636cb592fd..936b26183d 100644
--- a/autoload.php
+++ b/autoload.php
@@ -631,7 +631,7 @@ $wgAutoloadLocalClasses = [
 	'Interwiki' => __DIR__ . '/includes/interwiki/Interwiki.php',
 	'InvalidPassword' => __DIR__ . '/includes/password/InvalidPassword.php',
 	'InvalidateUserSesssions' => __DIR__ . '/maintenance/invalidateUserSessions.php',
-	'IteratorDecorator' => __DIR__ . '/includes/utils/iterators/IteratorDecorator.php',
+	'IteratorDecorator' => __DIR__ . '/includes/libs/iterators/IteratorDecorator.php',
 	'IuConverter' => __DIR__ . '/languages/classes/LanguageIu.php',
 	'JSCompilerContext' => __DIR__ . '/includes/libs/jsminplus.php',
 	'JSMinPlus' => __DIR__ . '/includes/libs/jsminplus.php',
@@ -983,7 +983,7 @@ $wgAutoloadLocalClasses = [
 	'NewPagesPager' => __DIR__ . '/includes/specials/pagers/NewPagesPager.php',
 	'NewUsersLogFormatter' => __DIR__ . '/includes/logging/NewUsersLogFormatter.php',
 	'NolinesImageGallery' => __DIR__ . '/includes/gallery/NolinesImageGallery.php',
-	'NotRecursiveIterator' => __DIR__ . '/includes/utils/iterators/NotRecursiveIterator.php',
+	'NotRecursiveIterator' => __DIR__ . '/includes/libs/iterators/NotRecursiveIterator.php',
 	'NukeNS' => __DIR__ . '/maintenance/nukeNS.php',
 	'NukePage' => __DIR__ . '/maintenance/nukePage.php',
 	'NullFileJournal' => __DIR__ . '/includes/libs/filebackend/filejournal/NullFileJournal.php',
diff --git a/includes/libs/iterators/IteratorDecorator.php b/includes/libs/iterators/IteratorDecorator.php
new file mode 100644
index 0000000000..c1b50207f9
--- /dev/null
+++ b/includes/libs/iterators/IteratorDecorator.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Allows extending classes to decorate an Iterator with
+ * reduced boilerplate.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Maintenance
+ */
+abstract class IteratorDecorator implements Iterator {
+	protected $iterator;
+
+	public function __construct( Iterator $iterator ) {
+		$this->iterator = $iterator;
+	}
+
+	public function current() {
+		return $this->iterator->current();
+	}
+
+	public function key() {
+		return $this->iterator->key();
+	}
+
+	public function next() {
+		$this->iterator->next();
+	}
+
+	public function rewind() {
+		$this->iterator->rewind();
+	}
+
+	public function valid() {
+		return $this->iterator->valid();
+	}
+}
diff --git a/includes/libs/iterators/NotRecursiveIterator.php b/includes/libs/iterators/NotRecursiveIterator.php
new file mode 100644
index 0000000000..52ca61b449
--- /dev/null
+++ b/includes/libs/iterators/NotRecursiveIterator.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Wraps a non-recursive iterator with methods to be recursive
+ * without children.
+ *
+ * Alternatively wraps a recursive iterator to prevent recursing deeper
+ * than the wrapped iterator.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Maintenance
+ */
+class NotRecursiveIterator extends IteratorDecorator implements RecursiveIterator {
+	public function hasChildren() {
+		return false;
+	}
+
+	public function getChildren() {
+		return null;
+	}
+}
diff --git a/includes/utils/iterators/IteratorDecorator.php b/includes/utils/iterators/IteratorDecorator.php
deleted file mode 100644
index c1b50207f9..0000000000
--- a/includes/utils/iterators/IteratorDecorator.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Allows extending classes to decorate an Iterator with
- * reduced boilerplate.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Maintenance
- */
-abstract class IteratorDecorator implements Iterator {
-	protected $iterator;
-
-	public function __construct( Iterator $iterator ) {
-		$this->iterator = $iterator;
-	}
-
-	public function current() {
-		return $this->iterator->current();
-	}
-
-	public function key() {
-		return $this->iterator->key();
-	}
-
-	public function next() {
-		$this->iterator->next();
-	}
-
-	public function rewind() {
-		$this->iterator->rewind();
-	}
-
-	public function valid() {
-		return $this->iterator->valid();
-	}
-}
diff --git a/includes/utils/iterators/NotRecursiveIterator.php b/includes/utils/iterators/NotRecursiveIterator.php
deleted file mode 100644
index 52ca61b449..0000000000
--- a/includes/utils/iterators/NotRecursiveIterator.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Wraps a non-recursive iterator with methods to be recursive
- * without children.
- *
- * Alternatively wraps a recursive iterator to prevent recursing deeper
- * than the wrapped iterator.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Maintenance
- */
-class NotRecursiveIterator extends IteratorDecorator implements RecursiveIterator {
-	public function hasChildren() {
-		return false;
-	}
-
-	public function getChildren() {
-		return null;
-	}
-}