Merge "Fixed and suppressed some thumb.php IDEA errors"

diff --combined thumb.php
index f5eb8c9,2cfe6b1..d39d43b
--- 1/thumb.php
--- 2/thumb.php
+++ b/thumb.php
@@@ -190,6 -190,7 +190,7 @@@ function wfStreamThumb( array $params 
                                if ( $targetFile->exists() ) {
                                        $newThumbName = $targetFile->thumbName( $params );
                                        if ( $isOld ) {
+                                               /** @var array $bits */
                                                $newThumbUrl = $targetFile->getArchiveThumbUrl(
                                                        $bits[0] . '!' . $targetFile->getName(), $newThumbName );
                                        } else {
@@@ -221,7 -222,7 +222,7 @@@
                wfThumbErrorText( 404, "The source file '$fileName' does not exist." );
                return;
        } elseif ( $img->getPath() === false ) {
 -              wfThumbErrorText( 500, "The source file '$fileName' is not locally accessible." );
 +              wfThumbErrorText( 400, "The source file '$fileName' is not locally accessible." );
                return;
        }
  
@@@ -316,25 -317,22 +317,25 @@@
  
        $user = RequestContext::getMain()->getUser();
        if ( !wfThumbIsStandard( $img, $params ) && $user->pingLimiter( 'renderfile-nonstandard' ) ) {
 -              wfThumbError( 500, wfMessage( 'actionthrottledtext' )->parse() );
 +              wfThumbError( 429, wfMessage( 'actionthrottledtext' )->parse() );
                return;
        } elseif ( $user->pingLimiter( 'renderfile' ) ) {
 -              wfThumbError( 500, wfMessage( 'actionthrottledtext' )->parse() );
 +              wfThumbError( 429, wfMessage( 'actionthrottledtext' )->parse() );
                return;
        }
  
        list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, $thumbName, $thumbPath );
  
-       /** @var MediaTransformOutput|bool $thumb */
+       /** @var MediaTransformOutput|MediaTransformError|bool $thumb */
  
        // Check for thumbnail generation errors...
        $msg = wfMessage( 'thumbnail_error' );
        $errorCode = 500;
        if ( !$thumb ) {
                $errorMsg = $errorMsg ?: $msg->rawParams( 'File::transform() returned false' )->escaped();
 +              if ( $errorMsg instanceof MessageSpecifier && $errorMsg->getKey() === 'thumbnail_image-failure-limit' ) {
 +                      $errorCode = 429;
 +              }
        } elseif ( $thumb->isError() ) {
                $errorMsg = $thumb->getHtmlMsg();
        } elseif ( !$thumb->hasFile() ) {
@@@ -415,7 -413,7 +416,7 @@@ function wfGenerateThumbnail( File $fil
                                'fallback' => function () {
                                        return wfMessage( 'generic-pool-error' )->parse();
                                },
-                               'error' => function ( $status ) {
+                               'error' => function ( Status $status ) {
                                        return $status->getHTML();
                                }
                        )
@@@ -430,6 -428,7 +431,7 @@@
                // Tried to select a page on a non-paged file?
        }
  
+       /** @noinspection PhpUnusedLocalVariableInspection */
        $done = true; // no PHP fatal occured
  
        if ( !$thumb || $thumb->isError() ) {
@@@ -500,7 -499,7 +502,7 @@@ function wfExtractThumbRequestInfo( $th
   */
  function wfExtractThumbParams( $file, $params ) {
        if ( !isset( $params['thumbName'] ) ) {
-               throw new MWException( "No thumbnail name passed to wfExtractThumbParams" );
+               throw new InvalidArgumentException( "No thumbnail name passed to wfExtractThumbParams" );
        }
  
        $thumbname = $params['thumbName'];
@@@ -539,7 -538,7 +541,7 @@@
  
        // As a last ditch fallback, use the traditional common parameters
        if ( preg_match( '!^(page(\d*)-)*(\d*)px-[^/]*$!', $thumbname, $matches ) ) {
-               list( /* all */, $pagefull, $pagenum, $size ) = $matches;
+               list( /* all */, /* pagefull */, $pagenum, $size ) = $matches;
                $params['width'] = $size;
                if ( $pagenum ) {
                        $params['page'] = $pagenum;
@@@ -554,11 -553,11 +556,11 @@@
   * Output a thumbnail generation error message
   *
   * @param int $status
-  * @param string $msg Plain text (will be html escaped)
+  * @param string $msgText Plain text (will be html escaped)
   * @return void
   */
  function wfThumbErrorText( $status, $msgText ) {
 -      return wfThumbError( $status, htmlspecialchars( $msgText ) );
 +      wfThumbError( $status, htmlspecialchars( $msgText ) );
  }
  
  /**
@@@ -573,8 -572,10 +575,8 @@@ function wfThumbError( $status, $msgHtm
  
        header( 'Cache-Control: no-cache' );
        header( 'Content-Type: text/html; charset=utf-8' );
 -      if ( $status == 400 ) {
 -              HttpStatus::header( 400 );
 -      } elseif ( $status == 404 ) {
 -              HttpStatus::header( 404 );
 +      if ( $status == 400 || $status == 404 || $status == 429 ) {
 +              HttpStatus::header( $status );
        } elseif ( $status == 403 ) {
                HttpStatus::header( 403 );
                header( 'Vary: Cookie' );