From bfe0fbebf48b1c12d7a3e1420c0d178fb52addae Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 19 Aug 2009 00:46:18 +0000
Subject: [PATCH] Redo r54644. php -l still sucks, but some people don't have
 parsekit. So let's support both :)

---
 maintenance/syntaxChecker.php | 57 +++++++++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 10 deletions(-)

diff --git a/maintenance/syntaxChecker.php b/maintenance/syntaxChecker.php
index 0ee01834d8..4ee3ef47a8 100644
--- a/maintenance/syntaxChecker.php
+++ b/maintenance/syntaxChecker.php
@@ -43,7 +43,15 @@ class SyntaxChecker extends Maintenance {
 		$this->output( "done.\n" );
 
 		$this->output( "Checking syntax (this can take a really long time)...\n\n" );
-		$res = $this->checkSyntax();
+		foreach( $this->mFiles as $f ) {
+			if( function_exists( 'parsekit_compile_file' ) ) {
+				$this->checkFileWithParsekit( $f );
+			} else {
+				$this->checkFileWithCli( $f );
+			}
+		}
+		$this->output( "\nDone! " . count( $this->mFiles ) . " files checked, " .
+			count( $this->mFailures ) . " failures found" );
 	}
 
 	/**
@@ -80,21 +88,50 @@ class SyntaxChecker extends Maintenance {
 	}
 
 	/**
-	 * Check the files for syntax errors
+	 * Check a file for syntax errors using Parsekit. Shamelessly stolen
+	 * from tools/lint.php by TimStarling
+	 * @param $file String Path to a file to check for syntax errors
 	 * @return boolean
 	 */
-	private function checkSyntax() {
-		foreach( $this->mFiles as $f ) {
-			$res = exec( 'php -l ' . $f ); 
-			if( strpos( $res, 'No syntax errors detected' ) === false ) {
-				$this->mFailures[] = $f;
-				$this->error( $res . "\n" );
+	private function checkFileWithParsekit( $file ) {
+		static $okErrors = array(
+			'Redefining already defined constructor',
+			'Assigning the return value of new by reference is deprecated',
+		);
+		$errors = array();
+		parsekit_compile_file( $file, $errors, PARSEKIT_SIMPLE );
+		$ret = true;
+		if ( $errors ) {
+			foreach ( $errors as $error ) {
+				foreach ( $okErrors as $okError ) {
+					if ( substr( $error['errstr'], 0, strlen( $okError ) ) == $okError ) {
+						continue 2;
+					}
+				}
+				$ret = false;
+				$this->output( "Error in $file line {$error['lineno']}: {$error['errstr']}\n" );
+				$this->mFailures[$file] = $errors;
 			}
 		}
-		$this->output( count($this->mFiles) . " files checked, " 
-			. count($this->mFailures) . " failures\n" );
+		return $ret;
+	}
+
+	/**
+	 * Check a file for syntax errors using php -l
+	 * @param $file String Path to a file to check for syntax errors
+	 * @return boolean
+	 */
+	private function checkFileWithCli( $file ) {
+		$res = exec( 'php -l ' . $file ); 
+		if( strpos( $res, 'No syntax errors detected' ) === false ) {
+			$this->mFailures[$file] = $res;
+			$this->output( $res . "\n" );
+			return false;
+		}
+		return true;
 	}
 }
 
 $maintClass = "SyntaxChecker";
 require_once( DO_MAINTENANCE );
+
-- 
2.20.1