* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
+ * @file
* @ingroup Maintenance
*/
-
+
require_once( dirname( __FILE__ ) . '/Maintenance.php' );
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/",
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 );
} 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 );
$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',
$this->output( 'done.', 'listfiles' );
}
-
+
/**
* Returns true if $file is of a type we can check
*/
}
$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' );
$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 );