Merge "Make some whitespace fixes to importImages maintenance script"

diff --combined maintenance/importImages.php
index d0d8a4b,526f7a2..954f36d
--- 1/maintenance/importImages.php
--- 2/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@@ -32,10 -32,10 +32,10 @@@
   * @author Mij <mij@bitchx.it>
   */
  
 -use MediaWiki\MediaWikiServices;
 -
  require_once __DIR__ . '/Maintenance.php';
  
 +use MediaWiki\MediaWikiServices;
 +
  class ImportImages extends Maintenance {
  
        public function __construct() {
@@@ -127,8 -127,6 +127,8 @@@
        public function execute() {
                global $wgFileExtensions, $wgUser, $wgRestrictionLevels;
  
 +              $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
 +
                $processed = $added = $ignored = $skipped = $overwritten = $failed = 0;
  
                $this->output( "Importing Files\n\n" );
@@@ -200,7 -198,8 +200,8 @@@
                                $title = Title::makeTitleSafe( NS_FILE, $base );
                                if ( !is_object( $title ) ) {
                                        $this->output(
-                                               "{$base} could not be imported; a valid title cannot be produced\n" );
+                                               "{$base} could not be imported; a valid title cannot be produced\n"
+                                       );
                                        continue;
                                }
  
@@@ -215,12 -214,10 +216,12 @@@
  
                                if ( $checkUserBlock && ( ( $processed % $checkUserBlock ) == 0 ) ) {
                                        $user->clearInstanceCache( 'name' ); // reload from DB!
 -                                      // @TODO Use PermissionManager::isBlockedFrom() instead.
 -                                      if ( $user->getBlock() ) {
 -                                              $this->output( $user->getName() . " was blocked! Aborting.\n" );
 -                                              break;
 +                                      if ( $permissionManager->isBlockedFrom( $user, $title ) ) {
 +                                              $this->output(
 +                                                      "{$user->getName()} is blocked from {$title->getPrefixedText()}! skipping.\n"
 +                                              );
 +                                              $skipped++;
 +                                              continue;
                                        }
                                }
  
@@@ -246,7 -243,8 +247,8 @@@
  
                                                if ( $dupes ) {
                                                        $this->output(
-                                                               "{$base} already exists as {$dupes[0]->getName()}, skipping\n" );
+                                                               "{$base} already exists as {$dupes[0]->getName()}, skipping\n"
+                                                       );
                                                        $skipped++;
                                                        continue;
                                                }
@@@ -274,7 -272,8 +276,8 @@@
                                                if ( $wgUser === false ) {
                                                        # user does not exist in target wiki
                                                        $this->output(
-                                                               "failed: user '$real_user' does not exist in target wiki." );
+                                                               "failed: user '$real_user' does not exist in target wiki."
+                                                       );
                                                        continue;
                                                }
                                        }
@@@ -291,7 -290,8 +294,8 @@@
                                                        $commentText = file_get_contents( $f );
                                                        if ( !$commentText ) {
                                                                $this->output(
-                                                                       " Failed to load comment file {$f}, using default comment. " );
+                                                                       " Failed to load comment file {$f}, using default comment. "
+                                                               );
                                                        }
                                                }
                                        }