From 05c9c770688bcb5625b4975d9a49d5dfa3a1f148 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Tue, 4 Oct 2016 10:59:08 -0700 Subject: [PATCH] Remove some MediaWiki dependencies on utils/BatchRow* Change-Id: I35279875891630157c651e6575770ca4607bc168 --- includes/utils/BatchRowIterator.php | 8 ++++---- includes/utils/BatchRowUpdate.php | 9 +-------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/includes/utils/BatchRowIterator.php b/includes/utils/BatchRowIterator.php index 9fc243120a..602587ce45 100644 --- a/includes/utils/BatchRowIterator.php +++ b/includes/utils/BatchRowIterator.php @@ -82,11 +82,11 @@ class BatchRowIterator implements RecursiveIterator { * @param string|array $table The name or names of the table to read from * @param string|array $primaryKey The name or names of the primary key columns * @param integer $batchSize The number of rows to fetch per iteration - * @throws MWException + * @throws InvalidArgumentException */ public function __construct( IDatabase $db, $table, $primaryKey, $batchSize ) { if ( $batchSize < 1 ) { - throw new MWException( 'Batch size must be at least 1 row.' ); + throw new InvalidArgumentException( 'Batch size must be at least 1 row.' ); } $this->db = $db; $this->table = $table; @@ -97,7 +97,7 @@ class BatchRowIterator implements RecursiveIterator { } /** - * @param array $condition Query conditions suitable for use with + * @param array $conditions Query conditions suitable for use with * IDatabase::select */ public function addConditions( array $conditions ) { @@ -105,7 +105,7 @@ class BatchRowIterator implements RecursiveIterator { } /** - * @param array $condition Query join conditions suitable for use + * @param array $conditions Query join conditions suitable for use * with IDatabase::select */ public function addJoinConditions( array $conditions ) { diff --git a/includes/utils/BatchRowUpdate.php b/includes/utils/BatchRowUpdate.php index 1e7eda8b63..39b65c3fb3 100644 --- a/includes/utils/BatchRowUpdate.php +++ b/includes/utils/BatchRowUpdate.php @@ -112,15 +112,8 @@ class BatchRowUpdate { * * @param callable $output A callback taking a single string * parameter to output - * - * @throws MWException */ - public function setOutput( $output ) { - if ( !is_callable( $output ) ) { - throw new MWException( - 'Provided $output param is required to be callable.' - ); - } + public function setOutput( callable $output ) { $this->output = $output; } -- 2.20.1