MWHttpRequest: Restore ability to pass null for $options

[lhc/web/wiklou.git] / maintenance / importImages.php

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index d396703..eb13dd1 100644 (file)
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -133,11 +133,11 @@ class ImportImages extends Maintenance {
 
                # Check Protection
                if ( $this->hasOption( 'protect' ) && $this->hasOption( 'unprotect' ) ) {
-                       $this->error( "Cannot specify both protect and unprotect.  Only 1 is allowed.\n", 1 );
+                       $this->fatalError( "Cannot specify both protect and unprotect.  Only 1 is allowed.\n" );
                }
 
                if ( $this->hasOption( 'protect' ) && trim( $this->getOption( 'protect' ) ) ) {
-                       $this->error( "You must specify a protection option.\n", 1 );
+                       $this->fatalError( "You must specify a protection option.\n" );
                }
 
                # Prepare the list of allowed extensions
@@ -170,7 +170,7 @@ class ImportImages extends Maintenance {
                if ( $commentFile !== null ) {
                        $comment = file_get_contents( $commentFile );
                        if ( $comment === false || $comment === null ) {
-                               $this->error( "failed to read comment file: {$commentFile}\n", 1 );
+                               $this->fatalError( "failed to read comment file: {$commentFile}\n" );
                        }
                } else {
                        $comment = $this->getOption( 'comment', 'Importing file' );
@@ -185,9 +185,7 @@ class ImportImages extends Maintenance {
                # Batch "upload" operation
                $count = count( $files );
                if ( $count > 0 ) {
-
                        foreach ( $files as $file ) {
-
                                if ( $sleep && ( $processed > 0 ) ) {
                                        sleep( $sleep );
                                }
@@ -301,7 +299,7 @@ class ImportImages extends Maintenance {
                                                " publishing {$file} by '{$wgUser->getName()}', comment '$commentText'... "
                                        );
                                } else {
-                                       $mwProps = new MWFileProps( MimeMagic::singleton() );
+                                       $mwProps = new MWFileProps( MediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer() );
                                        $props = $mwProps->getPropsFromPath( $file, true );
                                        $flags = 0;
                                        $publishOptions = [];
@@ -309,9 +307,7 @@ class ImportImages extends Maintenance {
                                        if ( $handler ) {
                                                $metadata = MediaWiki\quietCall( 'unserialize', $props['metadata'] );
 
-                                               $publishOptions['headers'] = $handler->getContentHeaders(
-                                                       $metadata, $props['width'], $props['height']
-                                               );
+                                               $publishOptions['headers'] = $handler->getContentHeaders( $metadata );
                                        } else {
                                                $publishOptions['headers'] = [];
                                        }
@@ -338,7 +334,7 @@ class ImportImages extends Maintenance {
                                        $commentText,
                                        $props,
                                        $timestamp
-                               ) ) {
+                               )->isOK() ) {
                                        # We're done!
                                        $this->output( "done.\n" );
 
@@ -444,7 +440,7 @@ class ImportImages extends Maintenance {
        /**
         * Split a filename into filename and extension
         *
-        * @param string $filename Filename
+        * @param string $filename
         * @return array
         */
        private function splitFilename( $filename ) {
@@ -523,5 +519,5 @@ class ImportImages extends Maintenance {
 
 }
 
-$maintClass = 'ImportImages';
+$maintClass = ImportImages::class;
 require_once RUN_MAINTENANCE_IF_MAIN;