r114452 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r114451‎ | r114452 | r114453 >
Date:16:44, 23 March 2012
Author:platonides
Status:ok
Tags:
Comment:
r105516 decided to remove the space after require, making
the regex to fail (this is a token, not a function...).
Update to chnge from trunk/phase3 to mediawiki/core
Modified paths:
  • /trunk/tools/code-utils/check-vars.php (modified) (history)

Diff [purge]

Index: trunk/tools/code-utils/check-vars.php
@@ -4,10 +4,10 @@
55 * Checks a number of syntax conventions on variables from a valid PHP file.
66 *
77 * Run as:
8 - * find phase3/ \( -name \*.php -or -name \*.inc \) -not \( -name diffLanguage.php -o -name LocalSettings.php -o -name Parser?????.php \) -exec php tools/code-utils/check-vars.php \{\} +
 8+ * find core/ \( -name \*.php -or -name \*.inc \) -not \( -name diffLanguage.php -o -name LocalSettings.php -o -name Parser?????.php \) -exec php tools/code-utils/check-vars.php \{\} +
99 */
1010 if ( ! $IP = getenv( 'MW_INSTALL_PATH' ) ) {
11 - $IP = dirname( __FILE__ ) . "/../../phase3/";
 11+ $IP = dirname( __FILE__ ) . "/../../core/";
1212 }
1313
1414 $IP = rtrim( $IP, "/" );
@@ -317,7 +317,7 @@
318318 }
319319
320320 /* Skip HipHop specific requires */
321 - $source = preg_replace( '/if \( isset\( \$_SERVER\[\'MW_COMPILED\'\] \) \) {\\s+require \( \'phase3\/.*\' \);\\s+} else {/', 'if ( true ) {', $source );
 321+ $source = preg_replace( '/if \( isset\( \$_SERVER\[\'MW_COMPILED\'\] \) \) {\\s+require *\( \'core\/.*\' \);\\s+} else {/', 'if ( true ) {', $source );
322322
323323 $this->mTokens = token_get_all( $source );
324324 }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r105516FU r105512: just always use thumb.php style errorsaaron04:58, 8 December 2011

Status & tagging log