From f74400487fdb4c48833f566524d4079bce098250 Mon Sep 17 00:00:00 2001 From: Umherirrender Date: Thu, 12 Sep 2019 21:40:57 +0200 Subject: [PATCH] phan: Disable enable_class_alias_support It is enabled for b/c in extensions, but not needed in core Change-Id: I51dca12be9c77049f77563d9bf0edd07928c2300 --- .phan/config.php | 4 ++++ includes/EditPage.php | 2 +- includes/FeedUtils.php | 2 +- includes/Linker.php | 2 +- includes/Title.php | 2 +- includes/actions/InfoAction.php | 2 +- includes/actions/RollbackAction.php | 2 +- includes/api/ApiEditPage.php | 2 +- includes/api/ApiParse.php | 2 +- includes/api/ApiQueryDeletedrevs.php | 2 +- includes/changes/CategoryMembershipChange.php | 2 +- includes/changes/ChangesFeed.php | 2 +- includes/changes/ChangesList.php | 2 +- includes/changes/EnhancedChangesList.php | 2 +- includes/changes/RCCacheEntryFactory.php | 2 +- includes/changetags/ChangeTagsLogItem.php | 2 +- includes/content/ContentHandler.php | 2 +- includes/export/WikiExporter.php | 2 +- includes/filerepo/file/LocalFileDeleteBatch.php | 2 +- includes/historyblob/ConcatenatedGzipHistoryBlob.php | 1 - includes/historyblob/HistoryBlobCurStub.php | 1 - includes/historyblob/HistoryBlobStub.php | 1 - includes/installer/MysqlUpdater.php | 2 +- includes/installer/PostgresInstaller.php | 1 + includes/logging/DeleteLogFormatter.php | 2 +- includes/resourceloader/ResourceLoaderWikiModule.php | 2 +- includes/revisiondelete/RevDelArchivedFileItem.php | 2 +- includes/revisiondelete/RevDelFileItem.php | 2 +- includes/revisiondelete/RevDelList.php | 2 +- includes/revisiondelete/RevDelLogItem.php | 2 +- includes/revisiondelete/RevDelLogList.php | 2 +- includes/revisiondelete/RevDelRevisionItem.php | 2 +- includes/revisiondelete/RevDelRevisionList.php | 2 +- includes/revisiondelete/RevisionDeleteUser.php | 2 +- includes/revisiondelete/RevisionDeleter.php | 2 +- includes/revisionlist/RevisionItem.php | 2 +- includes/specials/SpecialBlockList.php | 1 + includes/specials/SpecialMergeHistory.php | 2 +- includes/specials/SpecialRevisionDelete.php | 2 +- includes/specials/pagers/ContribsPager.php | 2 +- includes/specials/pagers/DeletedContribsPager.php | 2 +- includes/watcheditem/WatchedItemQueryService.php | 2 +- languages/LanguageConverter.php | 2 +- maintenance/archives/upgradeLogging.php | 2 ++ maintenance/cleanupSpam.php | 2 +- maintenance/getText.php | 2 +- maintenance/populateRevisionLength.php | 2 +- maintenance/preprocessDump.php | 2 +- maintenance/refreshLinks.php | 2 +- maintenance/userDupes.inc | 2 +- tests/phpunit/maintenance/fetchTextTest.php | 2 +- 51 files changed, 52 insertions(+), 47 deletions(-) diff --git a/.phan/config.php b/.phan/config.php index b1ca2a73f0..56a8ccb0a6 100644 --- a/.phan/config.php +++ b/.phan/config.php @@ -111,6 +111,10 @@ $cfg['suppress_issue_types'] = array_merge( $cfg['suppress_issue_types'], [ // @todo Enable when the issue above is resolved and we update our config! $cfg['redundant_condition_detection'] = false; +// Do not use aliases in core. +// Use the correct name, because we don't need backward compatibility +$cfg['enable_class_alias_support'] = false; + $cfg['ignore_undeclared_variables_in_global_scope'] = true; // @todo It'd be great if we could just make phan read these from DefaultSettings, to avoid // duplicating the types. diff --git a/includes/EditPage.php b/includes/EditPage.php index c346b750d9..23d6ef96aa 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -25,7 +25,7 @@ use MediaWiki\EditPage\TextboxBuilder; use MediaWiki\EditPage\TextConflictHelper; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; use Wikimedia\ScopedCallback; /** diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php index 8efae4f7d6..bfd1e2a6cd 100644 --- a/includes/FeedUtils.php +++ b/includes/FeedUtils.php @@ -21,7 +21,7 @@ * @ingroup Feed */ -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; /** * Helper functions for feeds diff --git a/includes/Linker.php b/includes/Linker.php index 1a5058d6f4..324b1f5f4b 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -21,7 +21,7 @@ */ use MediaWiki\Linker\LinkTarget; use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; /** * Some internal bits split of from Skin.php. These functions are used diff --git a/includes/Title.php b/includes/Title.php index bdff7a759f..de418a7163 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -23,7 +23,7 @@ */ use MediaWiki\Permissions\PermissionManager; -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; use Wikimedia\Assert\Assert; use Wikimedia\Rdbms\Database; use Wikimedia\Rdbms\IDatabase; diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php index 9a8949f587..0360fe44d2 100644 --- a/includes/actions/InfoAction.php +++ b/includes/actions/InfoAction.php @@ -23,7 +23,7 @@ */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; use Wikimedia\Rdbms\Database; /** diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php index 519da617ba..1c9e63b99e 100644 --- a/includes/actions/RollbackAction.php +++ b/includes/actions/RollbackAction.php @@ -20,7 +20,7 @@ * @ingroup Actions */ -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; /** * User interface for the rollback action diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php index 06f6f6097d..1936407ac3 100644 --- a/includes/api/ApiEditPage.php +++ b/includes/api/ApiEditPage.php @@ -21,7 +21,7 @@ */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; /** * A module that allows for editing and creating pages. diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php index 40edafa687..2e7db78327 100644 --- a/includes/api/ApiParse.php +++ b/includes/api/ApiParse.php @@ -21,7 +21,7 @@ */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; /** * @ingroup API diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php index eb787d1cd3..b8caeb947d 100644 --- a/includes/api/ApiQueryDeletedrevs.php +++ b/includes/api/ApiQueryDeletedrevs.php @@ -22,7 +22,7 @@ use MediaWiki\MediaWikiServices; use MediaWiki\Storage\NameTableAccessException; -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; /** * Query module to enumerate all deleted revisions. diff --git a/includes/changes/CategoryMembershipChange.php b/includes/changes/CategoryMembershipChange.php index 14e391d7a0..5a7f45ea25 100644 --- a/includes/changes/CategoryMembershipChange.php +++ b/includes/changes/CategoryMembershipChange.php @@ -1,7 +1,7 @@