From deec3478c749badd21037ec3607478c846ff03b6 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 31 Dec 2013 15:33:15 -0800 Subject: [PATCH] Moved MappedIterator to /libs and changed exception type Now throws UnexpectedValueException rather than MWException. Change-Id: Id466b66f43db97c5837030d166b9abd66fd56e0d --- includes/AutoLoader.php | 2 +- includes/{utils => libs}/MappedIterator.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename includes/{utils => libs}/MappedIterator.php (96%) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 034aa154b8..09cbe827d3 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -681,6 +681,7 @@ $wgAutoloadLocalClasses = array( 'HttpStatus' => 'includes/libs/HttpStatus.php', 'IEContentAnalyzer' => 'includes/libs/IEContentAnalyzer.php', 'IEUrlExtension' => 'includes/libs/IEUrlExtension.php', + 'MappedIterator' => 'includes/libs/MappedIterator.php', 'JavaScriptMinifier' => 'includes/libs/JavaScriptMinifier.php', 'JSCompilerContext' => 'includes/libs/jsminplus.php', 'JSMinPlus' => 'includes/libs/jsminplus.php', @@ -1075,7 +1076,6 @@ $wgAutoloadLocalClasses = array( 'IP' => 'includes/utils/IP.php', 'MWCryptRand' => 'includes/utils/MWCryptRand.php', 'MWFunction' => 'includes/utils/MWFunction.php', - 'MappedIterator' => 'includes/utils/MappedIterator.php', 'RegexlikeReplacer' => 'includes/utils/StringUtils.php', 'ReplacementArray' => 'includes/utils/StringUtils.php', 'Replacer' => 'includes/utils/StringUtils.php', diff --git a/includes/utils/MappedIterator.php b/includes/libs/MappedIterator.php similarity index 96% rename from includes/utils/MappedIterator.php rename to includes/libs/MappedIterator.php index f2e6df6be9..7fdde8a81a 100644 --- a/includes/utils/MappedIterator.php +++ b/includes/libs/MappedIterator.php @@ -49,7 +49,7 @@ class MappedIterator extends FilterIterator { * @param Iterator|Array $iter * @param callable $vCallback Value transformation callback * @param array $options Options map (includes "accept") (since 1.22) - * @throws MWException + * @throws UnexpectedValueException */ public function __construct( $iter, $vCallback, array $options = array() ) { if ( is_array( $iter ) ) { @@ -57,7 +57,7 @@ class MappedIterator extends FilterIterator { } elseif ( $iter instanceof Iterator ) { $baseIterator = $iter; } else { - throw new MWException( "Invalid base iterator provided." ); + throw new UnexpectedValueException( "Invalid base iterator provided." ); } parent::__construct( $baseIterator ); $this->vCallback = $vCallback; -- 2.20.1