http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72836
Revision: 72836
Author: platonides
Date: 2010-09-11 22:04:43 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
Empty statements detection
Changes in global variables
Modified Paths:
--------------
trunk/tools/code-utils/check-vars.php
Modified: trunk/tools/code-utils/check-vars.php
===================================================================
--- trunk/tools/code-utils/check-vars.php 2010-09-11 21:56:11 UTC (rev
72835)
+++ trunk/tools/code-utils/check-vars.php 2010-09-11 22:04:43 UTC (rev
72836)
@@ -4,7 +4,7 @@
* Checks a number of syntax conventions on variables from a valid PHP file.
*
* Run as:
- * find phase3/ \( -name \*.php -or -name \*.inc \) -not \( -name
importUseModWiki.php -o -name diffLanguage.php -o -name LocalSettings.php \)
-exec php tools/code-utils/check-vars.php \{\} +
+ * 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 \{\} +
*/
require_once( dirname( __FILE__ ) . "/../../phase3/includes/Defines.php" ); #
Faster than parsing
@@ -77,12 +77,9 @@
'$wgAutoloadLocalClasses', #
AutoLoader.php, a couple of readers
'$wgCanonicalNamespaceNames', #
Namespace.php
'$wgContLang', # Setup.php
- '$wgContLanguageCode', # Should
probably be removed
- '$wgDBcataloged', #
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/45755#c7954
'$wgDeferredUpdateList', # Setup.php
'$wgExtModifiedFields',
'$wgExtNewFields', '$wgExtNewIndexes', '$wgExtNewTables', # Updates
'$wgFeedClasses', # Defines.php, many
uses
- '$wgIP', # Setup.php
'$wgLang', # Setup.php
'$wgLanguageNames', # Language.php,
read by others
'$wgMemc', # Setup.php
@@ -122,7 +119,11 @@
'$wgHtmlEntities' => array( 'Sanitizer.php' ),
'$wgHtmlEntityAliases' => array( 'Sanitizer.php' ),
'$wgFullyInitialised' => array( /* Set */ 'Setup.php',
/* read */ 'Exception.php' ),
+ '$wgContLanguageCode' => array( 'Setup.php' ),
'$wgUseLatin1' => array( 'FiveUpgrade.inc' ), # If you
upgrade from MW < 1.5 it will be there
+ '$wgDatabase' => array( 'DatabaseUpdater.php' ),
+ '$wgExtPGNewFields' => array( 'DatabaseUpdater.php',
'PostgresUpdater.php' ),
+ '$wgExtPGAlteredFields' => array(
'DatabaseUpdater.php', 'PostgresUpdater.php' ),
'$errs' => array( 'Installer.php' ),
'$mainListOpened' => array( 'Installer.php' ),
'$optionsWithArgs' => array( 'commandLine.inc' ),
@@ -194,8 +195,17 @@
if ( $lastMeaningfulToken[0] == T_OPEN_TAG && $token[0]
== T_OPEN_TAG ) {
# See r69767
- $this->warning( "$token[1] in line $token[2]
after $lastMeaningfulToken[1] in line $lastMeaningfulToken[2]" );
+ $this->warning( "{$token[1]} in line
{$token[2]} after {$lastMeaningfulToken[1]} in line {$lastMeaningfulToken[2]}"
);
}
+ if ( $token == ';' ) {
+ if ( $lastMeaningfulToken == ';' ) {
+ # See r72751, warn on ;;
+ $this->warning( "Empty statement" );
+ } elseif ( $lastMeaningfulToken[0] == T_FOR ) {
+ # But not on infinte for loops: for ( ;
; )
+ $currentToken = array(';', ';',
$lastMeaningfulToken[2] );
+ }
+ }
if ( $lastMeaningfulToken[0] == T_DECLARE && $token[0]
== T_STRING ) {
$currentToken[0] = T_WHITESPACE; # Ignore the
ticks or encoding
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
