Merge "Split ClassCollector class into own file"

diff --combined autoload.php
index 2bb26e3,67a235f..388dd0d
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -230,7 -230,7 +230,7 @@@ $wgAutoloadLocalClasses = 
        'CheckSyntax' => __DIR__ . '/maintenance/checkSyntax.php',
        'CheckUsernames' => __DIR__ . '/maintenance/checkUsernames.php',
        'ChronologyProtector' => __DIR__ . '/includes/db/ChronologyProtector.php',
-       'ClassCollector' => __DIR__ . '/includes/utils/AutoloadGenerator.php',
+       'ClassCollector' => __DIR__ . '/includes/utils/ClassCollector.php',
        'CleanupAncientTables' => __DIR__ . '/maintenance/cleanupAncientTables.php',
        'CleanupBlocks' => __DIR__ . '/maintenance/cleanupBlocks.php',
        'CleanupPreferences' => __DIR__ . '/maintenance/cleanupPreferences.php',
@@@ -240,9 -240,9 +240,9 @@@
        'CliInstaller' => __DIR__ . '/includes/installer/CliInstaller.php',
        'CloneDatabase' => __DIR__ . '/includes/db/CloneDatabase.php',
        'CodeContentHandler' => __DIR__ . '/includes/content/CodeContentHandler.php',
 -      'Collation' => __DIR__ . '/includes/Collation.php',
 -      'CollationCkb' => __DIR__ . '/includes/Collation.php',
 -      'CollationEt' => __DIR__ . '/includes/Collation.php',
 +      'Collation' => __DIR__ . '/includes/collation/Collation.php',
 +      'CollationCkb' => __DIR__ . '/includes/collation/CollationCkb.php',
 +      'CollationEt' => __DIR__ . '/includes/collation/CollationEt.php',
        'CommandLineInc' => __DIR__ . '/maintenance/commandLine.inc',
        'CommandLineInstaller' => __DIR__ . '/maintenance/install.php',
        'CompareParserCache' => __DIR__ . '/maintenance/compareParserCache.php',
@@@ -269,7 -269,7 +269,7 @@@
        'ConvertUserOptions' => __DIR__ . '/maintenance/convertUserOptions.php',
        'ConverterRule' => __DIR__ . '/languages/ConverterRule.php',
        'Cookie' => __DIR__ . '/includes/libs/Cookie.php',
 -      'CookieJar' => __DIR__ . '/includes/libs/Cookie.php',
 +      'CookieJar' => __DIR__ . '/includes/libs/CookieJar.php',
        'CopyFileBackend' => __DIR__ . '/maintenance/copyFileBackend.php',
        'CopyFileOp' => __DIR__ . '/includes/filebackend/FileOp.php',
        'CopyJobQueue' => __DIR__ . '/maintenance/copyJobQueue.php',
@@@ -398,7 -398,7 +398,7 @@@
        'EventRelayer' => __DIR__ . '/includes/libs/eventrelayer/EventRelayer.php',
        'EventRelayerGroup' => __DIR__ . '/includes/EventRelayerGroup.php',
        'EventRelayerMCRD' => __DIR__ . '/includes/libs/eventrelayer/EventRelayerMCRD.php',
 -      'EventRelayerNull' => __DIR__ . '/includes/libs/eventrelayer/EventRelayer.php',
 +      'EventRelayerNull' => __DIR__ . '/includes/libs/eventrelayer/EventRelayerNull.php',
        'Exif' => __DIR__ . '/includes/media/Exif.php',
        'ExifBitmapHandler' => __DIR__ . '/includes/media/ExifBitmap.php',
        'ExplodeIterator' => __DIR__ . '/includes/libs/ExplodeIterator.php',
@@@ -564,8 -564,8 +564,8 @@@
        'IPSet' => __DIR__ . '/includes/compat/IPSetCompat.php',
        'IPTC' => __DIR__ . '/includes/media/IPTC.php',
        'IRCColourfulRCFeedFormatter' => __DIR__ . '/includes/rcfeed/IRCColourfulRCFeedFormatter.php',
 -      'IcuCollation' => __DIR__ . '/includes/Collation.php',
 -      'IdentityCollation' => __DIR__ . '/includes/Collation.php',
 +      'IcuCollation' => __DIR__ . '/includes/collation/IcuCollation.php',
 +      'IdentityCollation' => __DIR__ . '/includes/collation/IdentityCollation.php',
        'ImageBuilder' => __DIR__ . '/maintenance/rebuildImages.php',
        'ImageCleanup' => __DIR__ . '/maintenance/cleanupImages.php',
        'ImageGallery' => __DIR__ . '/includes/gallery/TraditionalImageGallery.php',
@@@ -1375,7 -1375,7 +1375,7 @@@
        'UploadStashNotLoggedInException' => __DIR__ . '/includes/upload/UploadStash.php',
        'UploadStashWrongOwnerException' => __DIR__ . '/includes/upload/UploadStash.php',
        'UploadStashZeroLengthFileException' => __DIR__ . '/includes/upload/UploadStash.php',
 -      'UppercaseCollation' => __DIR__ . '/includes/Collation.php',
 +      'UppercaseCollation' => __DIR__ . '/includes/collation/UppercaseCollation.php',
        'UsageException' => __DIR__ . '/includes/api/ApiMain.php',
        'User' => __DIR__ . '/includes/user/User.php',
        'UserArray' => __DIR__ . '/includes/user/UserArray.php',