Revert r100262 — wasn't the right place for it and other problems,

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

diff --git a/maintenance/checkSyntax.php b/maintenance/checkSyntax.php
index c0966ae..cc4e5af 100644 (file)
--- a/maintenance/checkSyntax.php
+++ b/maintenance/checkSyntax.php
@@ -20,7 +20,7 @@
  * @file
  * @ingroup Maintenance
  */
- 
+
 require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class CheckSyntax extends Maintenance {
@@ -78,11 +78,11 @@ class CheckSyntax extends Maintenance {
                        // Compat stuff, explodes on PHP 5.3
                        "includes/NamespaceCompat.php$",
                        );
-       
+
                $this->mNoStyleCheckPaths = array(
                        // Third-party code we don't care about
                        "/activemq_stomp/",
-                       "EmailPage/phpMailer",
+                       "EmailPage/PHPMailer",
                        "FCKeditor/fckeditor/",
                        '\bphplot-',
                        "/svggraph/",
@@ -101,11 +101,14 @@ class CheckSyntax extends Maintenance {
                        return; // process only this path
                } elseif ( $this->hasOption( 'list-file' ) ) {
                        $file = $this->getOption( 'list-file' );
-                       $f = @fopen( $file, 'r' );
+                       wfSuppressWarnings();
+                       $f = fopen( $file, 'r' );
+                       wfRestoreWarnings();
                        if ( !$f ) {
                                $this->error( "Can't open file $file\n", true );
                        }
-                       while ( $path = trim( fgets( $f ) ) ) {
+                       $path = trim( fgets( $f ) );
+                       while ( $path ) {
                                $this->addPath( $path );
                        }
                        fclose( $f );
@@ -113,6 +116,7 @@ class CheckSyntax extends Maintenance {
                } elseif ( $this->hasOption( 'modified' ) ) {
                        $this->output( "Retrieving list from Subversion... " );
                        $parentDir = wfEscapeShellArg( dirname( __FILE__ ) . '/..' );
+                       $retval = null;
                        $output = wfShellExec( "svn status --ignore-externals $parentDir", $retval );
                        if ( $retval ) {
                                $this->error( "Error retrieving list from Subversion!\n", true );
@@ -131,11 +135,11 @@ class CheckSyntax extends Maintenance {
 
                $this->output( 'Building file list...', 'listfiles' );
 
-               // Only check files in these directories. 
+               // Only check files in these directories.
                // Don't just put $IP, because the recursive dir thingie goes into all subdirs
                $dirs = array(
                        $IP . '/includes',
-                       $IP . '/config',
+                       $IP . '/mw-config',
                        $IP . '/languages',
                        $IP . '/maintenance',
                        $IP . '/skins',
@@ -158,9 +162,11 @@ class CheckSyntax extends Maintenance {
 
                $this->output( 'done.', 'listfiles' );
        }
-       
+
        /**
         * Returns true if $file is of a type we can check
+        * @param $file string
+        * @return bool
         */
        private function isSuitableFile( $file ) {
                $file = str_replace( '\\', '/', $file );
@@ -177,6 +183,8 @@ class CheckSyntax extends Maintenance {
 
        /**
         * Add given path to file list, searching it in include path if needed
+        * @param $path string
+        * @return bool
         */
        private function addPath( $path ) {
                global $IP;
@@ -184,8 +192,10 @@ class CheckSyntax extends Maintenance {
        }
 
        /**
-       * Add given file to file list, or, if it's a directory, add its content
-       */
+        * Add given file to file list, or, if it's a directory, add its content
+        * @param $path string
+        * @return bool
+        */
        private function addFileOrDir( $path ) {
                if ( is_dir( $path ) ) {
                        $this->addDirectoryContent( $path );
@@ -273,7 +283,9 @@ class CheckSyntax extends Maintenance {
                }
 
                $text = file_get_contents( $file );
+               $tokens = token_get_all( $text );
 
+               $this->checkEvilToken( $file, $tokens, '@', 'Error supression operator (@)');
                $this->checkRegex( $file, $text, '/^[\s\r\n]+<\?/', 'leading whitespace' );
                $this->checkRegex( $file, $text, '/\?>[\s\r\n]*$/', 'trailing ?>' );
                $this->checkRegex( $file, $text, '/^[\xFF\xFE\xEF]/', 'byte-order mark' );
@@ -290,8 +302,20 @@ class CheckSyntax extends Maintenance {
                $this->mWarnings[$file][] = $desc;
                $this->output( "Warning in file $file: $desc found.\n" );
        }
+
+       private function checkEvilToken( $file, $tokens, $evilToken, $desc ) {
+               if ( !in_array( $evilToken, $tokens ) ) {
+                       return;
+               }
+
+               if ( !isset( $this->mWarnings[$file] ) ) {
+                       $this->mWarnings[$file] = array();
+               }
+               $this->mWarnings[$file][] = $desc;
+               $this->output( "Warning in file $file: $desc found.\n" );
+       }
 }
 
 $maintClass = "CheckSyntax";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );