r89390 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r89389‎ | r89390 | r89391 >
Date:03:48, 3 June 2011
Author:demon
Status:ok
Tags:
Comment:
Minor tweaks:
* $wgArticle and $mediaWiki are only ok in index.php
* $wgWikiFarm is no longer ok per r89388
* After refactor in r88016, no need to exclude it from a search
Modified paths:
  • /trunk/tools/code-utils/check-vars.php (modified) (history)

Diff [purge]

Index: trunk/tools/code-utils/check-vars.php
@@ -4,7 +4,7 @@
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 importUseModWiki.php -o -name diffLanguage.php -o -name LocalSettings.php -o -name Parser?????.php \) -exec php tools/code-utils/check-vars.php \{\} +
 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 \{\} +
99 */
1010 if( ! $IP = getenv( 'MW_INSTALL_PATH' ) ) {
1111 $IP = dirname( __FILE__ ) . "/../../phase3/";
@@ -160,7 +160,6 @@
161161 $this->load( "$IP/includes/DefaultSettings.php", false );
162162 if ( count( $this->mTokens ) > 0 ) {
163163 $globals = array (
164 - '$wgArticle', # Setup.php
165164 '$wgAutoloadLocalClasses', # AutoLoader.php, a couple of readers
166165 '$wgCanonicalNamespaceNames', # Namespace.php
167166 '$wgContLang', # Setup.php
@@ -186,7 +185,6 @@
187186 '$wgUseEnotif', # Setup.php
188187 '$wgUseNormalUser', # maintenance
189188 '$wgUser', # Setup.php
190 - '$wgWikiFarm', # maintenance, to be removed
191189 );
192190
193191 foreach ( $this->mTokens as $token ) {
@@ -221,6 +219,8 @@
222220 '$col' => array( 'UtfNormalTest2.php' ),
223221 '$lineNo' => array( 'UtfNormalTest2.php' ),
224222 '$cliUpgrade' => array( 'CliInstaller.php' ),
 223+ '$mediaWiki' => array( 'index.php' ),
 224+ '$wgArticle' => array( 'index.php' ),
225225 );
226226
227227 function setGenerateDeprecatedList( $bool = true ) {

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r88016Rewrite importUseModWiki to subclass maintenance, general cleanup, etc. Also ...demon19:04, 13 May 2011
r89388Kill $wgWikiFarm. Only use in a wmf code path, and I can't find any evidence ...demon03:38, 3 June 2011

Status & tagging log