Merge "Add two new debug log groups"

diff --combined includes/AutoLoader.php
index cfddb72,3bd398d..a9080b2
--- 1/includes/AutoLoader.php
--- 2/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -29,6 -29,7 +29,6 @@@ global $wgAutoloadLocalClasses
  
  $wgAutoloadLocalClasses = array(
        # Includes
 -      'Action' => 'includes/Action.php',
        'AjaxDispatcher' => 'includes/AjaxDispatcher.php',
        'AjaxResponse' => 'includes/AjaxResponse.php',
        'AlphabeticPager' => 'includes/Pager.php',
@@@ -79,6 -80,8 +79,6 @@@
        'FeedUtils' => 'includes/FeedUtils.php',
        'FileDeleteForm' => 'includes/FileDeleteForm.php',
        'ForkController' => 'includes/ForkController.php',
 -      'FormlessAction' => 'includes/Action.php',
 -      'FormAction' => 'includes/Action.php',
        'FormOptions' => 'includes/FormOptions.php',
        'FormSpecialPage' => 'includes/specialpage/FormSpecialPage.php',
        'GitInfo' => 'includes/GitInfo.php',
@@@ -96,8 -99,7 +96,8 @@@
        'HTMLFloatField' => 'includes/htmlform/HTMLFloatField.php',
        'HTMLForm' => 'includes/htmlform/HTMLForm.php',
        'HTMLFormField' => 'includes/htmlform/HTMLFormField.php',
 -      'HTMLFormFieldRequiredOptionsException' => 'includes/htmlform/HTMLFormFieldRequiredOptionsException.php',
 +      'HTMLFormFieldRequiredOptionsException' =>
 +              'includes/htmlform/HTMLFormFieldRequiredOptionsException.php',
        'HTMLHiddenField' => 'includes/htmlform/HTMLHiddenField.php',
        'HTMLInfoField' => 'includes/htmlform/HTMLInfoField.php',
        'HTMLIntField' => 'includes/htmlform/HTMLIntField.php',
@@@ -139,7 -141,6 +139,7 @@@
        'MailAddress' => 'includes/UserMailer.php',
        'MediaWiki' => 'includes/Wiki.php',
        'MediaWiki_I18N' => 'includes/SkinTemplate.php',
 +      'MediaWikiVersionFetcher' => 'includes/MediaWikiVersionFetcher.php',
        'Message' => 'includes/Message.php',
        'MessageBlobStore' => 'includes/MessageBlobStore.php',
        'MimeMagic' => 'includes/MimeMagic.php',
@@@ -236,13 -237,10 +236,13 @@@
        'XmlSelect' => 'includes/Xml.php',
  
        # includes/actions
 +      'Action' => 'includes/actions/Action.php',
        'CachedAction' => 'includes/actions/CachedAction.php',
        'CreditsAction' => 'includes/actions/CreditsAction.php',
        'DeleteAction' => 'includes/actions/DeleteAction.php',
        'EditAction' => 'includes/actions/EditAction.php',
 +      'FormlessAction' => 'includes/actions/FormlessAction.php',
 +      'FormAction' => 'includes/actions/FormAction.php',
        'HistoryAction' => 'includes/actions/HistoryAction.php',
        'HistoryPage' => 'includes/actions/HistoryAction.php',
        'HistoryPager' => 'includes/actions/HistoryAction.php',
@@@ -274,7 -272,6 +274,7 @@@
        'ApiEmailUser' => 'includes/api/ApiEmailUser.php',
        'ApiExpandTemplates' => 'includes/api/ApiExpandTemplates.php',
        'ApiFeedContributions' => 'includes/api/ApiFeedContributions.php',
 +      'ApiFeedRecentChanges' => 'includes/api/ApiFeedRecentChanges.php',
        'ApiFeedWatchlist' => 'includes/api/ApiFeedWatchlist.php',
        'ApiFileRevert' => 'includes/api/ApiFileRevert.php',
        'ApiFormatBase' => 'includes/api/ApiFormatBase.php',
@@@ -361,7 -358,6 +361,7 @@@
        'ApiRevisionDelete' => 'includes/api/ApiRevisionDelete.php',
        'ApiRollback' => 'includes/api/ApiRollback.php',
        'ApiRsd' => 'includes/api/ApiRsd.php',
 +      'ApiRunJobs' => 'includes/api/ApiRunJobs.php',
        'ApiSetNotificationTimestamp' => 'includes/api/ApiSetNotificationTimestamp.php',
        'ApiTokens' => 'includes/api/ApiTokens.php',
        'ApiUnblock' => 'includes/api/ApiUnblock.php',
@@@ -394,17 -390,12 +394,17 @@@
        'EnhancedChangesList' => 'includes/changes/EnhancedChangesList.php',
        'OldChangesList' => 'includes/changes/OldChangesList.php',
        'RCCacheEntry' => 'includes/changes/RCCacheEntry.php',
 +      'RCCacheEntryFactory' => 'includes/changes/RCCacheEntryFactory.php',
        'RecentChange' => 'includes/changes/RecentChange.php',
  
        # includes/clientpool
        'RedisConnectionPool' => 'includes/clientpool/RedisConnectionPool.php',
        'RedisConnRef' => 'includes/clientpool/RedisConnectionPool.php',
  
 +      # includes/composer
 +      'ComposerPackageModifier' => 'includes/composer/ComposerPackageModifier.php',
 +      'ComposerVersionNormalizer' => 'includes/composer/ComposerVersionNormalizer.php',
 +
        # includes/config
        'Config' => 'includes/config/Config.php',
        'GlobalConfig' => 'includes/config/GlobalConfig.php',
@@@ -452,7 -443,6 +452,7 @@@
        'DBConnectionError' => 'includes/db/DatabaseError.php',
        'DBConnRef' => 'includes/db/LoadBalancer.php',
        'DBError' => 'includes/db/DatabaseError.php',
 +      'DBExpectedError' => 'includes/db/DatabaseError.php',
        'DBObject' => 'includes/db/DatabaseUtility.php',
        'IDatabase'  => 'includes/db/Database.php',
        'IORMRow' => 'includes/db/IORMRow.php',
@@@ -1213,17 -1203,17 +1213,17 @@@ class AutoLoader 
                        }
  
                        if ( isset( self::$autoloadLocalClassesLower[$lowerClass] ) ) {
-                               if ( function_exists( 'wfDebug' ) ) {
-                                       wfDebug( "Class {$className} was loaded using incorrect case.\n" );
+                               if ( function_exists( 'wfDebugLog' ) ) {
+                                       wfDebugLog( 'autoloader', "Class {$className} was loaded using incorrect case" );
                                }
                                $filename = self::$autoloadLocalClassesLower[$lowerClass];
                        }
                }
  
                if ( !$filename ) {
-                       if ( function_exists( 'wfDebug' ) ) {
+                       if ( function_exists( 'wfDebugLog' ) ) {
                                # FIXME: This is not very polite.  Assume we do not manage the class.
-                               wfDebug( "Class {$className} not found; skipped loading\n" );
+                               wfDebugLog( 'autoloader', "Class {$className} not found; skipped loading" );
                        }
  
                        # Give up

diff --combined includes/Setup.php
index d7438e5,35da714..777ca37
--- 1/includes/Setup.php
--- 2/includes/Setup.php
+++ b/includes/Setup.php
@@@ -265,10 -265,6 +265,10 @@@ if ( $wgSkipSkin ) 
        $wgSkipSkins[] = $wgSkipSkin;
  }
  
 +if ( $wgLocalInterwiki ) {
 +      array_unshift( $wgLocalInterwikis, $wgLocalInterwiki );
 +}
 +
  # Set default shared prefix
  if ( $wgSharedPrefix === false ) {
        $wgSharedPrefix = $wgDBprefix;
@@@ -456,11 -452,6 +456,11 @@@ if ( !$wgHTCPRouting && $wgHTCPMulticas
        );
  }
  
 +// Back compatibility for $wgRateLimitLog deprecated with 1.23
 +if ( $wgRateLimitLog && ! array_key_exists( 'ratelimit', $wgDebugLogGroups ) ) {
 +      $wgDebugLogGroups['ratelimit'] = $wgRateLimitLog;
 +}
 +
  wfProfileOut( $fname . '-defaults2' );
  wfProfileIn( $fname . '-misc1' );
  
@@@ -512,9 -503,9 +512,9 @@@ $messageMemc = wfGetMessageCacheStorage
  $parserMemc = wfGetParserCacheStorage();
  $wgLangConvMemc = wfGetLangConverterCacheStorage();
  
- wfDebug( 'CACHES: ' . get_class( $wgMemc ) . '[main] ' .
+ wfDebugLog( 'caches', get_class( $wgMemc ) . '[main] ' .
        get_class( $messageMemc ) . '[message] ' .
-       get_class( $parserMemc ) . "[parser]\n" );
+       get_class( $parserMemc ) . '[parser]' );
  
  wfProfileOut( $fname . '-memcached' );