From e3debf80f2b611ad316fe9d337ca3bd242926b3d Mon Sep 17 00:00:00 2001 From: Ricordisamoa Date: Thu, 11 Feb 2016 09:51:01 +0100 Subject: [PATCH] Remove PHP < 5.3 support from maintenance/checkSyntax.php Change-Id: I2b8e941ef036b8de499a45cf077b07d3f4957540 --- maintenance/checkSyntax.php | 44 ++----------------------------------- 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/maintenance/checkSyntax.php b/maintenance/checkSyntax.php index 4821e04972..998cade4cc 100644 --- a/maintenance/checkSyntax.php +++ b/maintenance/checkSyntax.php @@ -65,19 +65,9 @@ class CheckSyntax extends Maintenance { public function execute() { $this->buildFileList(); - // ParseKit is broken on PHP 5.3+, disabled until this is fixed - $useParseKit = function_exists( 'parsekit_compile_file' ) - && version_compare( PHP_VERSION, '5.3', '<' ); - - $str = 'Checking syntax (using ' . ( $useParseKit ? - 'parsekit' : ' php -l, this can take a long time' ) . ")\n"; - $this->output( $str ); + $this->output( "Checking syntax (using php -l, this can take a long time)\n" ); foreach ( $this->mFiles as $f ) { - if ( $useParseKit ) { - $this->checkFileWithParsekit( $f ); - } else { - $this->checkFileWithCli( $f ); - } + $this->checkFileWithCli( $f ); if ( !$this->hasOption( 'syntax-only' ) ) { $this->checkForMistakes( $f ); } @@ -293,36 +283,6 @@ class CheckSyntax extends Maintenance { } } - /** - * Check a file for syntax errors using Parsekit. Shamelessly stolen - * from tools/lint.php by TimStarling - * @param string $file Path to a file to check for syntax errors - * @return bool - */ - 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; - } - } - - return $ret; - } - /** * Check a file for syntax errors using php -l * @param string $file Path to a file to check for syntax errors -- 2.20.1