Merge "Don't use isset() to check for null"

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

diff --git a/maintenance/checkImages.php b/maintenance/checkImages.php
index fa06461..3921c07 100644 (file)
--- a/maintenance/checkImages.php
+++ b/maintenance/checkImages.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Check images to see if they exist, are readable, etc etc
+ * Check images to see if they exist, are readable, etc.
  *
  * 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
@@ -20,8 +20,13 @@
  * @file
  * @ingroup Maintenance
  */
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
+/**
+ * Maintenance script to check images to see if they exist, are readable, etc.
+ *
+ * @ingroup Maintenance
+ */
 class CheckImages extends Maintenance {
 
        public function __construct() {
@@ -49,7 +54,9 @@ class CheckImages extends Maintenance {
                                        $this->output( "{$row->img_name}: not locally accessible\n" );
                                        continue;
                                }
-                               $stat = @stat( $file->getPath() );
+                               wfSuppressWarnings();
+                               $stat = stat( $file->getPath() );
+                               wfRestoreWarnings();
                                if ( !$stat ) {
                                        $this->output( "{$row->img_name}: missing\n" );
                                        continue;
@@ -66,13 +73,13 @@ class CheckImages extends Maintenance {
                                }
 
                                if ( $stat['size'] != $row->img_size ) {
-                                       $this->output( "{$row->img_name}: size mismatch DB={$row->img_size}, actual={$stat['size']}\n" );
+                                       $this->output( "{$row->img_name}: size mismatch DB={$row->img_size}, "
+                                               . "actual={$stat['size']}\n" );
                                        continue;
                                }
 
                                $numGood++;
                        }
-
                } while ( $res->numRows() );
 
                $this->output( "Good images: $numGood/$numImages\n" );
@@ -80,4 +87,4 @@ class CheckImages extends Maintenance {
 }
 
 $maintClass = "CheckImages";
-require_once( DO_MAINTENANCE );
+require_once RUN_MAINTENANCE_IF_MAIN;