Merge "Revert "Mechanism for renaming/aliasing classes""

diff --combined includes/AutoLoader.php
index 0e56b7c,cd062e0..f179e78
--- 1/includes/AutoLoader.php
--- 2/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -234,6 -234,8 +234,6 @@@ $wgAutoloadLocalClasses = array
        'WebRequestUpload' => 'includes/WebRequest.php',
        'WebResponse' => 'includes/WebResponse.php',
        'WikiCategoryPage' => 'includes/WikiCategoryPage.php',
 -      'WikiError' => 'includes/WikiError.php',
 -      'WikiErrorMsg' => 'includes/WikiError.php',
        'WikiExporter' => 'includes/Export.php',
        'WikiFilePage' => 'includes/WikiFilePage.php',
        'WikiImporter' => 'includes/Import.php',
@@@ -241,6 -243,7 +241,6 @@@
        'WikiRevision' => 'includes/Import.php',
        'WikiMap' => 'includes/WikiMap.php',
        'WikiReference' => 'includes/WikiMap.php',
 -      'WikiXmlError' => 'includes/WikiError.php',
        'Xml' => 'includes/Xml.php',
        'XmlDumpWriter' => 'includes/Export.php',
        'XmlJsCode' => 'includes/Xml.php',
@@@ -330,7 -333,6 +330,7 @@@
        'ApiQueryCategoryInfo' => 'includes/api/ApiQueryCategoryInfo.php',
        'ApiQueryCategoryMembers' => 'includes/api/ApiQueryCategoryMembers.php',
        'ApiQueryContributions' => 'includes/api/ApiQueryUserContributions.php',
 +      'ApiQueryContributors' => 'includes/api/ApiQueryContributors.php',
        'ApiQueryDeletedrevs' => 'includes/api/ApiQueryDeletedrevs.php',
        'ApiQueryDisabled' => 'includes/api/ApiQueryDisabled.php',
        'ApiQueryDuplicateFiles' => 'includes/api/ApiQueryDuplicateFiles.php',
@@@ -675,11 -677,9 +675,11 @@@
        'CSSJanus_Tokenizer' => 'includes/libs/CSSJanus.php',
        'CSSMin' => 'includes/libs/CSSMin.php',
        'GenericArrayObject' => 'includes/libs/GenericArrayObject.php',
 +      'HashRing' => 'includes/libs/HashRing.php',
        'HttpStatus' => 'includes/libs/HttpStatus.php',
        'IEContentAnalyzer' => 'includes/libs/IEContentAnalyzer.php',
        'IEUrlExtension' => 'includes/libs/IEUrlExtension.php',
 +      'MappedIterator' => 'includes/libs/MappedIterator.php',
        'JavaScriptMinifier' => 'includes/libs/JavaScriptMinifier.php',
        'JSCompilerContext' => 'includes/libs/jsminplus.php',
        'JSMinPlus' => 'includes/libs/jsminplus.php',
@@@ -687,7 -687,6 +687,7 @@@
        'JSParser' => 'includes/libs/jsminplus.php',
        'JSToken' => 'includes/libs/jsminplus.php',
        'JSTokenizer' => 'includes/libs/jsminplus.php',
 +      'MultiHttpClient' => 'includes/libs/MultiHttpClient.php',
        'MWMessagePack' => 'includes/libs/MWMessagePack.php',
        'RunningStat' => 'includes/libs/RunningStat.php',
        'ScopedCallback' => 'includes/libs/ScopedCallback.php',
@@@ -827,7 -826,6 +827,7 @@@
  
        # includes/profiler
        'Profiler' => 'includes/profiler/Profiler.php',
 +      'ProfilerMwprof' => 'includes/profiler/ProfilerMwprof.php',
        'ProfilerSimple' => 'includes/profiler/ProfilerSimple.php',
        'ProfilerSimpleText' => 'includes/profiler/ProfilerSimpleText.php',
        'ProfilerSimpleTrace' => 'includes/profiler/ProfilerSimpleTrace.php',
@@@ -842,8 -840,6 +842,8 @@@
        'RCFeedFormatter' => 'includes/rcfeed/RCFeedFormatter.php',
        'IRCColourfulRCFeedFormatter' => 'includes/rcfeed/IRCColourfulRCFeedFormatter.php',
        'JSONRCFeedFormatter' => 'includes/rcfeed/JSONRCFeedFormatter.php',
 +      'XMLRCFeedFormatter' => 'includes/rcfeed/XMLRCFeedFormatter.php',
 +      'MachineReadableRCFeedFormatter' => 'includes/rcfeed/MachineReadableRCFeedFormatter.php',
  
        # includes/resourceloader
        'ResourceLoader' => 'includes/resourceloader/ResourceLoader.php',
@@@ -1072,10 -1068,12 +1072,10 @@@
        'ConfEditorToken' => 'includes/utils/ConfEditor.php',
        'DoubleReplacer' => 'includes/utils/StringUtils.php',
        'ExplodeIterator' => 'includes/utils/StringUtils.php',
 -      'HashRing' => 'includes/utils/HashRing.php',
        'HashtableReplacer' => 'includes/utils/StringUtils.php',
        'IP' => 'includes/utils/IP.php',
        'MWCryptRand' => 'includes/utils/MWCryptRand.php',
        'MWFunction' => 'includes/utils/MWFunction.php',
 -      'MappedIterator' => 'includes/utils/MappedIterator.php',
        'RegexlikeReplacer' => 'includes/utils/StringUtils.php',
        'ReplacementArray' => 'includes/utils/StringUtils.php',
        'Replacer' => 'includes/utils/StringUtils.php',
@@@ -1211,32 -1209,6 +1211,6 @@@ class AutoLoader 
                        return;
                }
  
-               if ( substr( $filename, 0, 6 ) === 'alias:' ) {
-                       // Supported alias formats:
-                       // - No deprecation warning: alias:MyNewClassName
-                       // - Deprecated in MediaWiki 1.1: alias:MyNewClassName?v=1.1
-                       // - Deprecated in MyExtension 1.1: alias:MyNewClassName?c=MyExtension&v=1.1
-                       $parts = explode( '?', substr( $filename, 6 ), 2 );
-                       $newClassName = $parts[0];
- 
-                       // If necessary, this will make a recursive call to this function to
-                       // load the class using its actual, canonical name.
-                       class_alias( $newClassName, $className );
- 
-                       if ( isset( $parts[1] ) && function_exists( 'wfDeprecated' ) ) {
-                               $info = wfCgiToArray( $parts[1] );
-                               $function = "name $className for class $newClassName";
-                               $version = isset( $info['v'] ) ? $info['v'] : false;
-                               $component = isset( $info['c'] ) ? $info['c'] : false;
- 
-                               // https://github.com/facebook/hhvm/issues/1018
-                               $callerOffset = wfIsHHVM() ? 2 : 3;
-                               wfDeprecated( $function, $version, $component, $callerOffset );
-                       }
- 
-                       return;
-               }
- 
                # Make an absolute path, this improves performance by avoiding some stat calls
                if ( substr( $filename, 0, 1 ) != '/' && substr( $filename, 1, 1 ) != ':' ) {
                        global $IP;