Update to MediaWiki 1.24.1

1 files changed, 46 insertions, 19 deletions

diff --git a/maintenance/refreshImageMetadata.php b/maintenance/refreshImageMetadata.php
index 7fe5c4c1..831118ca 100644
--- a/maintenance/refreshImageMetadata.php
+++ b/maintenance/refreshImageMetadata.php
@@ -5,7 +5,7 @@
  * Usage: php refreshImageMetadata.php
  *
  * Copyright © 2011 Brian Wolff
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
  *
  * 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
@@ -47,15 +47,41 @@ class RefreshImageMetadata extends Maintenance {
 		$this->mDescription = 'Script to update image metadata records';
 		$this->setBatchSize( 200 );
 
-		$this->addOption( 'force', 'Reload metadata from file even if the metadata looks ok', false, false, 'f' );
-		$this->addOption( 'broken-only', 'Only fix really broken records, leave old but still compatible records alone.' );
-		$this->addOption( 'verbose', 'Output extra information about each upgraded/non-upgraded file.', false, false, 'v' );
+		$this->addOption(
+			'force',
+			'Reload metadata from file even if the metadata looks ok',
+			false,
+			false,
+			'f'
+		);
+		$this->addOption(
+			'broken-only',
+			'Only fix really broken records, leave old but still compatible records alone.'
+		);
+		$this->addOption(
+			'verbose',
+			'Output extra information about each upgraded/non-upgraded file.',
+			false,
+			false,
+			'v'
+		);
 		$this->addOption( 'start', 'Name of file to start with', false, true );
 		$this->addOption( 'end', 'Name of file to end with', false, true );
 
-		$this->addOption( 'mime', '(Inefficient!) Only refresh files with this mime type. Can accept wild-card image/*', false, true );
-		$this->addOption( 'metadata-contains', '(Inefficient!) Only refresh files where the img_metadata field contains this string. Can be used if its known a specific property was being extracted incorrectly.', false, true );
-
+		$this->addOption(
+			'mime',
+			'(Inefficient!) Only refresh files with this MIME type. Can accept wild-card image/*',
+			false,
+			true
+		);
+		$this->addOption(
+			'metadata-contains',
+			'(Inefficient!) Only refresh files where the img_metadata field '
+				. 'contains this string. Can be used if its known a specific '
+				. 'property was being extracted incorrectly.',
+			false,
+			true
+		);
 	}
 
 	public function execute() {
@@ -121,7 +147,7 @@ class RefreshImageMetadata extends Maintenance {
 						// to weed out any inconsequential changes.
 						$error++;
 						$this->output( "Warning: File:{$row->img_name} used to have " .
-						"$oldLength bytes of metadata but now has $newLength bytes.\n" );
+							"$oldLength bytes of metadata but now has $newLength bytes.\n" );
 					} elseif ( $verbose ) {
 						$this->output( "Refreshed File:{$row->img_name}.\n" );
 					}
@@ -134,20 +160,17 @@ class RefreshImageMetadata extends Maintenance {
 						if ( $newLength < $oldLength - 5 ) {
 							$error++;
 							$this->output( "Warning: File:{$row->img_name} used to have " .
-							"$oldLength bytes of metadata but now has $newLength bytes. (forced)\n" );
-
+								"$oldLength bytes of metadata but now has $newLength bytes. (forced)\n" );
 						}
 						if ( $verbose ) {
 							$this->output( "Forcibly refreshed File:{$row->img_name}.\n" );
 						}
-					}
-					else {
+					} else {
 						if ( $verbose ) {
 							$this->output( "Skipping File:{$row->img_name}.\n" );
 						}
 					}
 				}
-
 			}
 			$conds2 = array( 'img_name > ' . $dbw->addQuotes( $row->img_name ) );
 			wfWaitForSlaves();
@@ -155,14 +178,18 @@ class RefreshImageMetadata extends Maintenance {
 
 		$total = $upgraded + $leftAlone;
 		if ( $force ) {
-			$this->output( "\nFinished refreshing file metadata for $total files. $upgraded needed to be refreshed, $leftAlone did not need to be but were refreshed anyways, and $error refreshes were suspicious.\n" );
+			$this->output( "\nFinished refreshing file metadata for $total files. "
+				. "$upgraded needed to be refreshed, $leftAlone did not need to "
+				. "be but were refreshed anyways, and $error refreshes were suspicious.\n" );
 		} else {
-			$this->output( "\nFinished refreshing file metadata for $total files. $upgraded were refreshed, $leftAlone were already up to date, and $error refreshes were suspicious.\n" );
+			$this->output( "\nFinished refreshing file metadata for $total files. "
+				. "$upgraded were refreshed, $leftAlone were already up to date, "
+				. "and $error refreshes were suspicious.\n" );
 		}
 	}
 
 	/**
-	 * @param $dbw DatabaseBase
+	 * @param DatabaseBase $dbw
 	 * @return array
 	 */
 	function getConditions( $dbw ) {
@@ -185,12 +212,13 @@ class RefreshImageMetadata extends Maintenance {
 		if ( $like ) {
 			$conds[] = 'img_metadata ' . $dbw->buildLike( $dbw->anyString(), $like, $dbw->anyString() );
 		}
+
 		return $conds;
 	}
 
 	/**
-	 * @param $force bool
-	 * @param $brokenOnly bool
+	 * @param bool $force
+	 * @param bool $brokenOnly
 	 */
 	function setupParameters( $force, $brokenOnly ) {
 		global $wgUpdateCompatibleMetadata;
@@ -207,6 +235,5 @@ class RefreshImageMetadata extends Maintenance {
 	}
 }
 
-
 $maintClass = 'RefreshImageMetadata';
 require_once RUN_MAINTENANCE_IF_MAIN;