Merge "Remove XMPReader back compat"

diff --combined .phpcs.xml
index a4426f6,7eac427..50635c0
--- 1/.phpcs.xml
--- 2/.phpcs.xml
+++ b/.phpcs.xml
@@@ -72,7 -72,6 +72,6 @@@
                -->
                <exclude-pattern>*/includes/installer/PhpBugTests\.php</exclude-pattern>
                <exclude-pattern>*/includes/specials/SpecialMostinterwikis\.php</exclude-pattern>
-               <exclude-pattern>*/includes/compat/XMPReader\.php</exclude-pattern>
                <exclude-pattern>*/includes/diff/DairikiDiff\.php</exclude-pattern>
                <exclude-pattern>*/includes/specials/SpecialAncientpages\.php</exclude-pattern>
                <exclude-pattern>*/includes/specials/SpecialBrokenRedirects\.php</exclude-pattern>
@@@ -170,6 -169,17 +169,6 @@@
                        Whitelist existing violations, but enable the sniff to prevent
                        any new occurrences.
                -->
 -              <exclude-pattern>*/includes/specials/SpecialActiveusers\.php</exclude-pattern>
 -              <exclude-pattern>*/includes/specials/SpecialBooksources\.php</exclude-pattern>
 -              <exclude-pattern>*/includes/specials/SpecialEmailuser\.php</exclude-pattern>
 -              <exclude-pattern>*/includes/specials/SpecialListfiles\.php</exclude-pattern>
 -              <exclude-pattern>*/includes/specials/SpecialListgrants\.php</exclude-pattern>
 -              <exclude-pattern>*/includes/specials/SpecialListgrouprights\.php</exclude-pattern>
 -              <exclude-pattern>*/includes/specials/SpecialListusers.php</exclude-pattern>
 -              <exclude-pattern>*/includes/specials/SpecialRecentchanges\.php</exclude-pattern>
 -              <exclude-pattern>*/includes/specials/SpecialRecentchangeslinked\.php</exclude-pattern>
 -              <exclude-pattern>*/includes/specials/SpecialRevisiondelete\.php</exclude-pattern>
 -              <exclude-pattern>*/includes/specials/SpecialWhatlinkshere\.php</exclude-pattern>
                <exclude-pattern>*/maintenance/language/alltrans\.php</exclude-pattern>
                <exclude-pattern>*/maintenance/language/digit2html\.php</exclude-pattern>
                <exclude-pattern>*/maintenance/language/langmemusage\.php</exclude-pattern>
@@@ -194,7 -204,6 +193,6 @@@
                        any new occurrences.
                -->
                <exclude-pattern>*/includes/api/ApiErrorFormatter\.php</exclude-pattern>
-               <exclude-pattern>*/includes/compat/XMPReader\.php</exclude-pattern>
                <exclude-pattern>*/includes/diff/DairikiDiff\.php</exclude-pattern>
                <exclude-pattern>*/includes/htmlform/HTMLFormElement\.php</exclude-pattern>
                <exclude-pattern>*/includes/libs/filebackend/FileBackendStore\.php</exclude-pattern>
@@@ -204,6 -213,7 +202,6 @@@
                <exclude-pattern>*/includes/parser/Preprocessor_Hash\.php</exclude-pattern>
                <exclude-pattern>*/includes/parser/Preprocessor\.php</exclude-pattern>
                <exclude-pattern>*/includes/profiler/SectionProfiler\.php</exclude-pattern>
 -              <exclude-pattern>*/includes/StubObject\.php</exclude-pattern>
                <exclude-pattern>*/includes/utils/AutoloadGenerator\.php</exclude-pattern>
                <exclude-pattern>*/maintenance/dumpIterator\.php</exclude-pattern>
                <exclude-pattern>*/maintenance/Maintenance\.php</exclude-pattern>
@@@ -222,7 -232,6 +220,7 @@@
        </rule>
        <rule ref="PSR2.Methods.MethodDeclaration.Underscore">
                <exclude-pattern>*/includes/StubObject\.php</exclude-pattern>
 +              <exclude-pattern>*/includes/StubUserLang\.php</exclude-pattern>
        </rule>
        <rule ref="MediaWiki.Usage.AssignmentInReturn.AssignmentInReturn">
                <exclude-pattern>*/tests/phpunit/*\.php</exclude-pattern>

diff --combined autoload.php
index aabc963,4aaf7b5..4b6682e
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -1341,7 -1341,7 +1341,7 @@@ $wgAutoloadLocalClasses = 
        'SkinTemplate' => __DIR__ . '/includes/skins/SkinTemplate.php',
        'SlideshowImageGallery' => __DIR__ . '/includes/gallery/SlideshowImageGallery.php',
        'SlotDiffRenderer' => __DIR__ . '/includes/diff/SlotDiffRenderer.php',
 -      'SpecialActiveUsers' => __DIR__ . '/includes/specials/SpecialActiveusers.php',
 +      'SpecialActiveUsers' => __DIR__ . '/includes/specials/SpecialActiveUsers.php',
        'SpecialAllMessages' => __DIR__ . '/includes/specials/SpecialAllMessages.php',
        'SpecialAllMyUploads' => __DIR__ . '/includes/specials/redirects/SpecialAllMyUploads.php',
        'SpecialAllPages' => __DIR__ . '/includes/specials/SpecialAllPages.php',
@@@ -1351,7 -1351,7 +1351,7 @@@
        'SpecialBlankpage' => __DIR__ . '/includes/specials/SpecialBlankpage.php',
        'SpecialBlock' => __DIR__ . '/includes/specials/SpecialBlock.php',
        'SpecialBlockList' => __DIR__ . '/includes/specials/SpecialBlockList.php',
 -      'SpecialBookSources' => __DIR__ . '/includes/specials/SpecialBooksources.php',
 +      'SpecialBookSources' => __DIR__ . '/includes/specials/SpecialBookSources.php',
        'SpecialBotPasswords' => __DIR__ . '/includes/specials/SpecialBotPasswords.php',
        'SpecialCachedPage' => __DIR__ . '/includes/specials/SpecialCachedPage.php',
        'SpecialCategories' => __DIR__ . '/includes/specials/SpecialCategories.php',
@@@ -1365,7 -1365,7 +1365,7 @@@
        'SpecialDiff' => __DIR__ . '/includes/specials/SpecialDiff.php',
        'SpecialEditTags' => __DIR__ . '/includes/specials/SpecialEditTags.php',
        'SpecialEditWatchlist' => __DIR__ . '/includes/specials/SpecialEditWatchlist.php',
 -      'SpecialEmailUser' => __DIR__ . '/includes/specials/SpecialEmailuser.php',
 +      'SpecialEmailUser' => __DIR__ . '/includes/specials/SpecialEmailUser.php',
        'SpecialExpandTemplates' => __DIR__ . '/includes/specials/SpecialExpandTemplates.php',
        'SpecialExport' => __DIR__ . '/includes/specials/SpecialExport.php',
        'SpecialFilepath' => __DIR__ . '/includes/specials/SpecialFilepath.php',
@@@ -1375,10 -1375,10 +1375,10 @@@
        'SpecialLinkAccounts' => __DIR__ . '/includes/specials/SpecialLinkAccounts.php',
        'SpecialListAdmins' => __DIR__ . '/includes/specials/redirects/SpecialListAdmins.php',
        'SpecialListBots' => __DIR__ . '/includes/specials/redirects/SpecialListBots.php',
 -      'SpecialListFiles' => __DIR__ . '/includes/specials/SpecialListfiles.php',
 -      'SpecialListGrants' => __DIR__ . '/includes/specials/SpecialListgrants.php',
 -      'SpecialListGroupRights' => __DIR__ . '/includes/specials/SpecialListgrouprights.php',
 -      'SpecialListUsers' => __DIR__ . '/includes/specials/SpecialListusers.php',
 +      'SpecialListFiles' => __DIR__ . '/includes/specials/SpecialListFiles.php',
 +      'SpecialListGrants' => __DIR__ . '/includes/specials/SpecialListGrants.php',
 +      'SpecialListGroupRights' => __DIR__ . '/includes/specials/SpecialListGroupRights.php',
 +      'SpecialListUsers' => __DIR__ . '/includes/specials/SpecialListUsers.php',
        'SpecialLockdb' => __DIR__ . '/includes/specials/SpecialLockdb.php',
        'SpecialLog' => __DIR__ . '/includes/specials/SpecialLog.php',
        'SpecialMergeHistory' => __DIR__ . '/includes/specials/SpecialMergeHistory.php',
@@@ -1405,13 -1405,13 +1405,13 @@@
        'SpecialRandomInCategory' => __DIR__ . '/includes/specials/SpecialRandomInCategory.php',
        'SpecialRandomredirect' => __DIR__ . '/includes/specials/SpecialRandomredirect.php',
        'SpecialRandomrootpage' => __DIR__ . '/includes/specials/SpecialRandomrootpage.php',
 -      'SpecialRecentChanges' => __DIR__ . '/includes/specials/SpecialRecentchanges.php',
 -      'SpecialRecentChangesLinked' => __DIR__ . '/includes/specials/SpecialRecentchangeslinked.php',
 +      'SpecialRecentChanges' => __DIR__ . '/includes/specials/SpecialRecentChanges.php',
 +      'SpecialRecentChangesLinked' => __DIR__ . '/includes/specials/SpecialRecentChangesLinked.php',
        'SpecialRedirect' => __DIR__ . '/includes/specials/SpecialRedirect.php',
        'SpecialRedirectToSpecial' => __DIR__ . '/includes/specialpage/SpecialRedirectToSpecial.php',
        'SpecialRemoveCredentials' => __DIR__ . '/includes/specials/SpecialRemoveCredentials.php',
        'SpecialResetTokens' => __DIR__ . '/includes/specials/SpecialResetTokens.php',
 -      'SpecialRevisionDelete' => __DIR__ . '/includes/specials/SpecialRevisiondelete.php',
 +      'SpecialRevisionDelete' => __DIR__ . '/includes/specials/SpecialRevisionDelete.php',
        'SpecialRunJobs' => __DIR__ . '/includes/specials/SpecialRunJobs.php',
        'SpecialSearch' => __DIR__ . '/includes/specials/SpecialSearch.php',
        'SpecialSpecialpages' => __DIR__ . '/includes/specials/SpecialSpecialpages.php',
@@@ -1429,7 -1429,7 +1429,7 @@@
        'SpecialUserLogout' => __DIR__ . '/includes/specials/SpecialUserLogout.php',
        'SpecialVersion' => __DIR__ . '/includes/specials/SpecialVersion.php',
        'SpecialWatchlist' => __DIR__ . '/includes/specials/SpecialWatchlist.php',
 -      'SpecialWhatLinksHere' => __DIR__ . '/includes/specials/SpecialWhatlinkshere.php',
 +      'SpecialWhatLinksHere' => __DIR__ . '/includes/specials/SpecialWhatLinksHere.php',
        'SqlBagOStuff' => __DIR__ . '/includes/objectcache/SqlBagOStuff.php',
        'SqlSearchResultSet' => __DIR__ . '/includes/search/SqlSearchResultSet.php',
        'Sqlite' => __DIR__ . '/maintenance/sqlite.inc',
@@@ -1450,7 -1450,7 +1450,7 @@@
        'StringUtils' => __DIR__ . '/includes/libs/StringUtils.php',
        'StripState' => __DIR__ . '/includes/parser/StripState.php',
        'StubObject' => __DIR__ . '/includes/StubObject.php',
 -      'StubUserLang' => __DIR__ . '/includes/StubObject.php',
 +      'StubUserLang' => __DIR__ . '/includes/StubUserLang.php',
        'SubmitAction' => __DIR__ . '/includes/actions/SubmitAction.php',
        'SubpageImportTitleFactory' => __DIR__ . '/includes/title/SubpageImportTitleFactory.php',
        'SvgHandler' => __DIR__ . '/includes/media/SvgHandler.php',
@@@ -1691,9 -1691,6 +1691,6 @@@
        'WrapOldPasswords' => __DIR__ . '/maintenance/wrapOldPasswords.php',
        'XCFHandler' => __DIR__ . '/includes/media/XCFHandler.php',
        'XMLRCFeedFormatter' => __DIR__ . '/includes/rcfeed/XMLRCFeedFormatter.php',
-       'XMPInfo' => __DIR__ . '/includes/compat/XMPReader.php',
-       'XMPReader' => __DIR__ . '/includes/compat/XMPReader.php',
-       'XMPValidate' => __DIR__ . '/includes/compat/XMPReader.php',
        'Xhprof' => __DIR__ . '/includes/libs/Xhprof.php',
        'XhprofData' => __DIR__ . '/includes/libs/XhprofData.php',
        'Xml' => __DIR__ . '/includes/Xml.php',