From dff469a408dac341da27c97eaac85df946140e30 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Thu, 20 Sep 2018 13:29:04 -0400 Subject: [PATCH] Re-namespace RevisionStore and RevisionRecord classes During development a lot of classes were placed in MediaWiki\Storage\. The precedent set would mean that every class relating to something stored in a database table, plus all related value classes and such, would go into that namespace. Let's put them into MediaWiki\Revision\ instead. Then future classes related to the 'page' table can go into MediaWiki\Page\, future classes related to the 'user' table can go into MediaWiki\User\, and so on. Note I didn't move DerivedPageDataUpdater, PageUpdateException, PageUpdater, or RevisionSlotsUpdate in this patch. If these are kept long-term, they probably belong in MediaWiki\Page\ or MediaWiki\Edit\ instead. Bug: T204158 Change-Id: I16bea8927566a3c73c07e4f4afb3537e05aa04a5 --- RELEASE-NOTES-1.32 | 7 ++ autoload.php | 16 ++- includes/AutoLoader.php | 1 + includes/MediaWikiServices.php | 8 +- includes/Revision.php | 16 +-- .../IncompleteRevisionException.php | 9 +- .../MutableRevisionRecord.php | 10 +- .../MutableRevisionSlots.php | 9 +- includes/Revision/RenderedRevision.php | 2 - .../RevisionAccessException.php | 9 +- .../RevisionArchiveRecord.php | 9 +- .../{Storage => Revision}/RevisionFactory.php | 9 +- .../{Storage => Revision}/RevisionLookup.php | 9 +- .../{Storage => Revision}/RevisionRecord.php | 9 +- includes/Revision/RevisionRenderer.php | 2 - .../{Storage => Revision}/RevisionSlots.php | 9 +- .../{Storage => Revision}/RevisionStore.php | 14 ++- .../RevisionStoreFactory.php | 4 +- .../RevisionStoreRecord.php | 9 +- includes/{Storage => Revision}/SlotRecord.php | 9 +- includes/Revision/SlotRenderingProvider.php | 1 - .../SuppressedDataException.php | 9 +- includes/ServiceWiring.php | 10 +- includes/Storage/DerivedPageDataUpdater.php | 5 + includes/Storage/PageUpdater.php | 5 + includes/Storage/RevisionSlotsUpdate.php | 4 + includes/actions/McrUndoAction.php | 6 +- includes/api/ApiComparePages.php | 8 +- includes/api/ApiFeedContributions.php | 8 +- includes/api/ApiQueryAllDeletedRevisions.php | 2 +- includes/api/ApiQueryAllRevisions.php | 2 +- includes/api/ApiQueryContributors.php | 2 +- includes/api/ApiQueryDeletedRevisions.php | 2 +- includes/api/ApiQueryFilearchive.php | 2 +- includes/api/ApiQueryRecentChanges.php | 2 +- includes/api/ApiQueryRevisions.php | 2 +- includes/api/ApiQueryRevisionsBase.php | 6 +- includes/api/ApiQueryUserContribs.php | 2 +- includes/api/ApiQueryWatchlist.php | 2 +- includes/api/ApiRevisionDelete.php | 2 +- includes/api/ApiTag.php | 2 +- includes/diff/DifferenceEngine.php | 4 +- includes/jobqueue/jobs/RefreshLinksJob.php | 2 +- includes/page/Article.php | 6 +- includes/page/PageArchive.php | 4 +- includes/page/WikiPage.php | 6 +- includes/poolcounter/PoolWorkArticleView.php | 8 +- includes/specials/SpecialUndelete.php | 2 +- maintenance/edit.php | 2 +- maintenance/populateContentTables.php | 2 +- maintenance/storage/dumpRev.php | 2 +- tests/common/TestsAutoLoader.php | 18 ++-- .../McrReadNewRevisionStoreDbTest.php | 8 +- .../McrReadNewSchemaOverride.php | 2 +- .../McrRevisionStoreDbTest.php | 16 +-- .../McrSchemaDetection.php | 2 +- .../McrSchemaOverride.php | 2 +- .../McrWriteBothRevisionStoreDbTest.php | 12 +-- .../McrWriteBothSchemaOverride.php | 2 +- .../MutableRevisionRecordTest.php | 16 +-- .../MutableRevisionSlotsTest.php | 16 +-- .../NoContentModelRevisionStoreDbTest.php | 4 +- .../PreMcrRevisionStoreDbTest.php | 6 +- .../PreMcrSchemaOverride.php | 2 +- .../Revision/RenderedRevisionTest.php | 18 ++-- .../RevisionArchiveRecordTest.php | 14 +-- .../RevisionQueryInfoTest.php | 10 +- .../RevisionRecordTests.php | 20 ++-- .../Revision/RevisionRendererTest.php | 8 +- .../RevisionSlotsTest.php | 36 +++---- .../RevisionStoreDbTestBase.php | 98 +++++++++---------- .../RevisionStoreFactoryTest.php | 6 +- .../RevisionStoreRecordTest.php | 14 +-- .../RevisionStoreTest.php | 20 ++-- .../{Storage => Revision}/SlotRecordTest.php | 10 +- .../create-pre-mcr-fields.sql | 0 .../{Storage => Revision}/drop-mcr-tables.sql | 0 .../drop-pre-mcr-fields.sql | 0 .../drop-pre-mcr-fields.sqlite.sql | 0 tests/phpunit/includes/RevisionDbTestBase.php | 10 +- tests/phpunit/includes/RevisionMcrDbTest.php | 6 +- .../includes/RevisionMcrReadNewDbTest.php | 6 +- .../includes/RevisionMcrWriteBothDbTest.php | 2 +- .../includes/RevisionNoContentModelDbTest.php | 2 +- .../phpunit/includes/RevisionPreMcrDbTest.php | 2 +- tests/phpunit/includes/RevisionTest.php | 26 ++--- .../Storage/DerivedPageDataUpdaterTest.php | 8 +- .../includes/Storage/PageUpdaterTest.php | 4 +- .../Storage/RevisionSlotsUpdateTest.php | 8 +- .../api/ApiQueryWatchlistIntegrationTest.php | 2 +- .../content/WikitextContentHandlerTest.php | 2 +- .../includes/diff/DifferenceEngineTest.php | 6 +- .../phpunit/includes/page/ArticleViewTest.php | 6 +- .../includes/page/PageArchiveMcrTest.php | 2 +- .../includes/page/PageArchivePreMcrTest.php | 4 +- .../includes/page/PageArchiveTestBase.php | 2 +- .../includes/page/WikiPageDbTestBase.php | 2 +- .../includes/page/WikiPageMcrDbTest.php | 2 +- .../page/WikiPageMcrReadNewDbTest.php | 2 +- .../page/WikiPageMcrWriteBothDbTest.php | 2 +- .../page/WikiPageNoContentModelDbTest.php | 2 +- .../includes/page/WikiPagePreMcrDbTest.php | 2 +- .../includes/parser/ParserMethodsTest.php | 6 +- .../poolcounter/PoolWorkArticleViewTest.php | 6 +- 104 files changed, 450 insertions(+), 324 deletions(-) rename includes/{Storage => Revision}/IncompleteRevisionException.php (77%) rename includes/{Storage => Revision}/MutableRevisionRecord.php (96%) rename includes/{Storage => Revision}/MutableRevisionSlots.php (91%) rename includes/{Storage => Revision}/RevisionAccessException.php (78%) rename includes/{Storage => Revision}/RevisionArchiveRecord.php (95%) rename includes/{Storage => Revision}/RevisionFactory.php (92%) rename includes/{Storage => Revision}/RevisionLookup.php (93%) rename includes/{Storage => Revision}/RevisionRecord.php (98%) rename includes/{Storage => Revision}/RevisionSlots.php (96%) rename includes/{Storage => Revision}/RevisionStore.php (99%) rename includes/{Storage => Revision}/RevisionStoreFactory.php (97%) rename includes/{Storage => Revision}/RevisionStoreRecord.php (96%) rename includes/{Storage => Revision}/SlotRecord.php (98%) rename includes/{Storage => Revision}/SuppressedDataException.php (78%) rename tests/phpunit/includes/{Storage => Revision}/McrReadNewRevisionStoreDbTest.php (95%) rename tests/phpunit/includes/{Storage => Revision}/McrReadNewSchemaOverride.php (97%) rename tests/phpunit/includes/{Storage => Revision}/McrRevisionStoreDbTest.php (92%) rename tests/phpunit/includes/{Storage => Revision}/McrSchemaDetection.php (97%) rename tests/phpunit/includes/{Storage => Revision}/McrSchemaOverride.php (97%) rename tests/phpunit/includes/{Storage => Revision}/McrWriteBothRevisionStoreDbTest.php (94%) rename tests/phpunit/includes/{Storage => Revision}/McrWriteBothSchemaOverride.php (97%) rename tests/phpunit/includes/{Storage => Revision}/MutableRevisionRecordTest.php (96%) rename tests/phpunit/includes/{Storage => Revision}/MutableRevisionSlotsTest.php (93%) rename tests/phpunit/includes/{Storage => Revision}/NoContentModelRevisionStoreDbTest.php (97%) rename tests/phpunit/includes/{Storage => Revision}/PreMcrRevisionStoreDbTest.php (94%) rename tests/phpunit/includes/{Storage => Revision}/PreMcrSchemaOverride.php (96%) rename tests/phpunit/includes/{Storage => Revision}/RevisionArchiveRecordTest.php (95%) rename tests/phpunit/includes/{Storage => Revision}/RevisionQueryInfoTest.php (99%) rename tests/phpunit/includes/{Storage => Revision}/RevisionRecordTests.php (96%) rename tests/phpunit/includes/{Storage => Revision}/RevisionSlotsTest.php (88%) rename tests/phpunit/includes/{Storage => Revision}/RevisionStoreDbTestBase.php (94%) rename tests/phpunit/includes/{Storage => Revision}/RevisionStoreFactoryTest.php (97%) rename tests/phpunit/includes/{Storage => Revision}/RevisionStoreRecordTest.php (96%) rename tests/phpunit/includes/{Storage => Revision}/RevisionStoreTest.php (96%) rename tests/phpunit/includes/{Storage => Revision}/SlotRecordTest.php (98%) rename tests/phpunit/includes/{Storage => Revision}/create-pre-mcr-fields.sql (100%) rename tests/phpunit/includes/{Storage => Revision}/drop-mcr-tables.sql (100%) rename tests/phpunit/includes/{Storage => Revision}/drop-pre-mcr-fields.sql (100%) rename tests/phpunit/includes/{Storage => Revision}/drop-pre-mcr-fields.sqlite.sql (100%) diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32 index 63d0894344..5b871e0ecb 100644 --- a/RELEASE-NOTES-1.32 +++ b/RELEASE-NOTES-1.32 @@ -482,6 +482,13 @@ because of Phabricator reports. deprecated. Use CommentStore::insert() instead. * Language::setCode is deprecated as public function. Use Language::factory to create a new Language object with a different language code. +* Several classes have been moved from the MediaWiki\Storage\ namespace to the + MediaWiki\Revision\ namespace. The old class names are aliased for + compatibility, but are deprecated. Classes are IncompleteRevisionException, + MutableRevisionRecord, MutableRevisionSlots, RevisionAccessException, + RevisionArchiveRecord, RevisionFactory, RevisionLookup, RevisionRecord, + RevisionSlots, RevisionStore, RevisionStoreRecord, SlotRecord, and + SuppressedDataException. === Other changes in 1.32 === * (T198811) The following tables have had their UNIQUE indexes turned into diff --git a/autoload.php b/autoload.php index ac47093776..6f26f35493 100644 --- a/autoload.php +++ b/autoload.php @@ -896,13 +896,23 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\MediaWikiServices' => __DIR__ . '/includes/MediaWikiServices.php', 'MediaWiki\\OutputHandler' => __DIR__ . '/includes/OutputHandler.php', 'MediaWiki\\ProcOpenError' => __DIR__ . '/includes/exception/ProcOpenError.php', - 'MediaWiki\\Revision\\RenderedRevision' => __DIR__ . '/includes/Revision/RenderedRevision.php', - 'MediaWiki\\Revision\\RevisionRenderer' => __DIR__ . '/includes/Revision/RevisionRenderer.php', - 'MediaWiki\\Revision\\SlotRenderingProvider' => __DIR__ . '/includes/Revision/SlotRenderingProvider.php', 'MediaWiki\\Search\\ParserOutputSearchDataExtractor' => __DIR__ . '/includes/search/ParserOutputSearchDataExtractor.php', 'MediaWiki\\ShellDisabledError' => __DIR__ . '/includes/exception/ShellDisabledError.php', 'MediaWiki\\Site\\MediaWikiPageNameNormalizer' => __DIR__ . '/includes/site/MediaWikiPageNameNormalizer.php', 'MediaWiki\\Special\\SpecialPageFactory' => __DIR__ . '/includes/specialpage/SpecialPageFactory.php', + 'MediaWiki\\Storage\\IncompleteRevisionException' => __DIR__ . '/includes/Revision/IncompleteRevisionException.php', + 'MediaWiki\\Storage\\MutableRevisionRecord' => __DIR__ . '/includes/Revision/MutableRevisionRecord.php', + 'MediaWiki\\Storage\\MutableRevisionSlots' => __DIR__ . '/includes/Revision/MutableRevisionSlots.php', + 'MediaWiki\\Storage\\RevisionAccessException' => __DIR__ . '/includes/Revision/RevisionAccessException.php', + 'MediaWiki\\Storage\\RevisionArchiveRecord' => __DIR__ . '/includes/Revision/RevisionArchiveRecord.php', + 'MediaWiki\\Storage\\RevisionFactory' => __DIR__ . '/includes/Revision/RevisionFactory.php', + 'MediaWiki\\Storage\\RevisionLookup' => __DIR__ . '/includes/Revision/RevisionLookup.php', + 'MediaWiki\\Storage\\RevisionRecord' => __DIR__ . '/includes/Revision/RevisionRecord.php', + 'MediaWiki\\Storage\\RevisionSlots' => __DIR__ . '/includes/Revision/RevisionSlots.php', + 'MediaWiki\\Storage\\RevisionStore' => __DIR__ . '/includes/Revision/RevisionStore.php', + 'MediaWiki\\Storage\\RevisionStoreRecord' => __DIR__ . '/includes/Revision/RevisionStoreRecord.php', + 'MediaWiki\\Storage\\SlotRecord' => __DIR__ . '/includes/Revision/SlotRecord.php', + 'MediaWiki\\Storage\\SuppressedDataException' => __DIR__ . '/includes/Revision/SuppressedDataException.php', 'MediaWiki\\User\\UserIdentity' => __DIR__ . '/includes/user/UserIdentity.php', 'MediaWiki\\User\\UserIdentityValue' => __DIR__ . '/includes/user/UserIdentityValue.php', 'MediaWiki\\Widget\\CheckMatrixWidget' => __DIR__ . '/includes/widget/CheckMatrixWidget.php', diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 5482f6a4e3..e4e59da983 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -134,6 +134,7 @@ class AutoLoader { 'MediaWiki\\EditPage\\' => __DIR__ . '/editpage/', 'MediaWiki\\Linker\\' => __DIR__ . '/linker/', 'MediaWiki\\Preferences\\' => __DIR__ . '/preferences/', + 'MediaWiki\\Revision\\' => __DIR__ . '/Revision/', 'MediaWiki\\Services\\' => __DIR__ . '/services/', 'MediaWiki\\Session\\' => __DIR__ . '/session/', 'MediaWiki\\Shell\\' => __DIR__ . '/shell/', diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php index b236ca1da1..0acd55a822 100644 --- a/includes/MediaWikiServices.php +++ b/includes/MediaWikiServices.php @@ -22,11 +22,11 @@ use MediaWiki\Storage\BlobStore; use MediaWiki\Storage\BlobStoreFactory; use MediaWiki\Storage\NameTableStore; use MediaWiki\Storage\NameTableStoreFactory; -use MediaWiki\Storage\RevisionFactory; -use MediaWiki\Storage\RevisionLookup; -use MediaWiki\Storage\RevisionStore; +use MediaWiki\Revision\RevisionFactory; +use MediaWiki\Revision\RevisionLookup; +use MediaWiki\Revision\RevisionStore; use OldRevisionImporter; -use MediaWiki\Storage\RevisionStoreFactory; +use MediaWiki\Revision\RevisionStoreFactory; use UploadRevisionImporter; use Wikimedia\Rdbms\LBFactory; use LinkCache; diff --git a/includes/Revision.php b/includes/Revision.php index e45c6dce0d..5a6afd8dad 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -20,14 +20,14 @@ * @file */ -use MediaWiki\Storage\MutableRevisionRecord; -use MediaWiki\Storage\RevisionAccessException; -use MediaWiki\Storage\RevisionFactory; -use MediaWiki\Storage\RevisionLookup; -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\RevisionStore; -use MediaWiki\Storage\RevisionStoreRecord; -use MediaWiki\Storage\SlotRecord; +use MediaWiki\Revision\MutableRevisionRecord; +use MediaWiki\Revision\RevisionAccessException; +use MediaWiki\Revision\RevisionFactory; +use MediaWiki\Revision\RevisionLookup; +use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Revision\RevisionStore; +use MediaWiki\Revision\RevisionStoreRecord; +use MediaWiki\Revision\SlotRecord; use MediaWiki\Storage\SqlBlobStore; use Wikimedia\Rdbms\IDatabase; use MediaWiki\Linker\LinkTarget; diff --git a/includes/Storage/IncompleteRevisionException.php b/includes/Revision/IncompleteRevisionException.php similarity index 77% rename from includes/Storage/IncompleteRevisionException.php rename to includes/Revision/IncompleteRevisionException.php index bf45b012d2..808b0d22d1 100644 --- a/includes/Storage/IncompleteRevisionException.php +++ b/includes/Revision/IncompleteRevisionException.php @@ -20,13 +20,20 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; /** * Exception throw when trying to access undefined fields on an incomplete RevisionRecord. * * @since 1.31 + * @since 1.32 Renamed from MediaWiki\Storage\IncompleteRevisionException */ class IncompleteRevisionException extends RevisionAccessException { } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.32 + */ +class_alias( IncompleteRevisionException::class, 'MediaWiki\Storage\IncompleteRevisionException' ); diff --git a/includes/Storage/MutableRevisionRecord.php b/includes/Revision/MutableRevisionRecord.php similarity index 96% rename from includes/Storage/MutableRevisionRecord.php rename to includes/Revision/MutableRevisionRecord.php index 72d6547bba..f287c05db7 100644 --- a/includes/Storage/MutableRevisionRecord.php +++ b/includes/Revision/MutableRevisionRecord.php @@ -20,11 +20,12 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; use CommentStoreComment; use Content; use InvalidArgumentException; +use MediaWiki\Storage\RevisionSlotsUpdate; use MediaWiki\User\UserIdentity; use MWException; use Title; @@ -35,6 +36,7 @@ use Wikimedia\Assert\Assert; * Provides setters for all fields. * * @since 1.31 + * @since 1.32 Renamed from MediaWiki\Storage\MutableRevisionRecord */ class MutableRevisionRecord extends RevisionRecord { @@ -334,3 +336,9 @@ class MutableRevisionRecord extends RevisionRecord { } } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.32 + */ +class_alias( MutableRevisionRecord::class, 'MediaWiki\Storage\MutableRevisionRecord' ); diff --git a/includes/Storage/MutableRevisionSlots.php b/includes/Revision/MutableRevisionSlots.php similarity index 91% rename from includes/Storage/MutableRevisionSlots.php rename to includes/Revision/MutableRevisionSlots.php index df949649af..cd4bc2e6be 100644 --- a/includes/Storage/MutableRevisionSlots.php +++ b/includes/Revision/MutableRevisionSlots.php @@ -20,7 +20,7 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; use Content; @@ -28,6 +28,7 @@ use Content; * Mutable version of RevisionSlots, for constructing a new revision. * * @since 1.31 + * @since 1.32 Renamed from MediaWiki\Storage\MutableRevisionSlots */ class MutableRevisionSlots extends RevisionSlots { @@ -107,3 +108,9 @@ class MutableRevisionSlots extends RevisionSlots { } } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.32 + */ +class_alias( MutableRevisionSlots::class, 'MediaWiki\Storage\MutableRevisionSlots' ); diff --git a/includes/Revision/RenderedRevision.php b/includes/Revision/RenderedRevision.php index fa16c61304..9cb20e0c01 100644 --- a/includes/Revision/RenderedRevision.php +++ b/includes/Revision/RenderedRevision.php @@ -24,8 +24,6 @@ namespace MediaWiki\Revision; use InvalidArgumentException; use LogicException; -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\SuppressedDataException; use ParserOptions; use ParserOutput; use Psr\Log\LoggerInterface; diff --git a/includes/Storage/RevisionAccessException.php b/includes/Revision/RevisionAccessException.php similarity index 78% rename from includes/Storage/RevisionAccessException.php rename to includes/Revision/RevisionAccessException.php index ee6efc0a0c..290991ecf6 100644 --- a/includes/Storage/RevisionAccessException.php +++ b/includes/Revision/RevisionAccessException.php @@ -20,7 +20,7 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; use RuntimeException; @@ -28,7 +28,14 @@ use RuntimeException; * Exception representing a failure to look up a revision. * * @since 1.31 + * @since 1.32 Renamed from MediaWiki\Storage\RevisionAccessException */ class RevisionAccessException extends RuntimeException { } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.32 + */ +class_alias( RevisionAccessException::class, 'MediaWiki\Storage\RevisionAccessException' ); diff --git a/includes/Storage/RevisionArchiveRecord.php b/includes/Revision/RevisionArchiveRecord.php similarity index 95% rename from includes/Storage/RevisionArchiveRecord.php rename to includes/Revision/RevisionArchiveRecord.php index 173da51907..67dc9b26d9 100644 --- a/includes/Storage/RevisionArchiveRecord.php +++ b/includes/Revision/RevisionArchiveRecord.php @@ -20,7 +20,7 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; use CommentStoreComment; use MediaWiki\User\UserIdentity; @@ -35,6 +35,7 @@ use Wikimedia\Assert\Assert; * was created. * * @since 1.31 + * @since 1.32 Renamed from MediaWiki\Storage\RevisionArchiveRecord */ class RevisionArchiveRecord extends RevisionRecord { @@ -177,3 +178,9 @@ class RevisionArchiveRecord extends RevisionRecord { } } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.32 + */ +class_alias( RevisionArchiveRecord::class, 'MediaWiki\Storage\RevisionArchiveRecord' ); diff --git a/includes/Storage/RevisionFactory.php b/includes/Revision/RevisionFactory.php similarity index 92% rename from includes/Storage/RevisionFactory.php rename to includes/Revision/RevisionFactory.php index 2c4546827a..44f1350706 100644 --- a/includes/Storage/RevisionFactory.php +++ b/includes/Revision/RevisionFactory.php @@ -20,7 +20,7 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; use MWException; use Title; @@ -29,6 +29,7 @@ use Title; * Service for constructing revision objects. * * @since 1.31 + * @since 1.32 Renamed from MediaWiki\Storage\RevisionFactory * * @note This was written to act as a drop-in replacement for the corresponding * static methods in Revision. @@ -92,3 +93,9 @@ interface RevisionFactory { ); } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.32 + */ +class_alias( RevisionFactory::class, 'MediaWiki\Storage\RevisionFactory' ); diff --git a/includes/Storage/RevisionLookup.php b/includes/Revision/RevisionLookup.php similarity index 93% rename from includes/Storage/RevisionLookup.php rename to includes/Revision/RevisionLookup.php index a6e29309fb..db6c7c30b4 100644 --- a/includes/Storage/RevisionLookup.php +++ b/includes/Revision/RevisionLookup.php @@ -20,7 +20,7 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; use IDBAccessObject; use MediaWiki\Linker\LinkTarget; @@ -33,6 +33,7 @@ use Title; * static methods in Revision. * * @since 1.31 + * @since 1.32 Renamed from MediaWiki\Storage\RevisionLookup */ interface RevisionLookup extends IDBAccessObject { @@ -118,3 +119,9 @@ interface RevisionLookup extends IDBAccessObject { public function getKnownCurrentRevision( Title $title, $revId ); } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.32 + */ +class_alias( RevisionLookup::class, 'MediaWiki\Storage\RevisionLookup' ); diff --git a/includes/Storage/RevisionRecord.php b/includes/Revision/RevisionRecord.php similarity index 98% rename from includes/Storage/RevisionRecord.php rename to includes/Revision/RevisionRecord.php index 8c31a3caf7..1a7831b5f4 100644 --- a/includes/Storage/RevisionRecord.php +++ b/includes/Revision/RevisionRecord.php @@ -20,7 +20,7 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; use CommentStoreComment; use Content; @@ -40,6 +40,7 @@ use Wikimedia\Assert\Assert; * Note that while the base class has no setters, subclasses may offer a mutable interface. * * @since 1.31 + * @since 1.32 Renamed from MediaWiki\Storage\RevisionRecord */ abstract class RevisionRecord { @@ -558,3 +559,9 @@ abstract class RevisionRecord { } } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.32 + */ +class_alias( RevisionRecord::class, 'MediaWiki\Storage\RevisionRecord' ); diff --git a/includes/Revision/RevisionRenderer.php b/includes/Revision/RevisionRenderer.php index c937376555..377477bf94 100644 --- a/includes/Revision/RevisionRenderer.php +++ b/includes/Revision/RevisionRenderer.php @@ -24,8 +24,6 @@ namespace MediaWiki\Revision; use Html; use InvalidArgumentException; -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\SlotRecord; use ParserOptions; use ParserOutput; use Psr\Log\LoggerInterface; diff --git a/includes/Storage/RevisionSlots.php b/includes/Revision/RevisionSlots.php similarity index 96% rename from includes/Storage/RevisionSlots.php rename to includes/Revision/RevisionSlots.php index 91969fc0c7..661137a8dc 100644 --- a/includes/Storage/RevisionSlots.php +++ b/includes/Revision/RevisionSlots.php @@ -20,7 +20,7 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; use Content; use LogicException; @@ -30,6 +30,7 @@ use Wikimedia\Assert\Assert; * Value object representing the set of slots belonging to a revision. * * @since 1.31 + * @since 1.32 Renamed from MediaWiki\Storage\RevisionSlots */ class RevisionSlots { @@ -310,3 +311,9 @@ class RevisionSlots { } } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.32 + */ +class_alias( RevisionSlots::class, 'MediaWiki\Storage\RevisionSlots' ); diff --git a/includes/Storage/RevisionStore.php b/includes/Revision/RevisionStore.php similarity index 99% rename from includes/Storage/RevisionStore.php rename to includes/Revision/RevisionStore.php index d9db8bd2c2..bef566d5f5 100644 --- a/includes/Storage/RevisionStore.php +++ b/includes/Revision/RevisionStore.php @@ -24,7 +24,7 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; use ActorMigration; use CommentStore; @@ -38,6 +38,11 @@ use InvalidArgumentException; use IP; use LogicException; use MediaWiki\Linker\LinkTarget; +use MediaWiki\Storage\BlobAccessException; +use MediaWiki\Storage\BlobStore; +use MediaWiki\Storage\NameTableAccessException; +use MediaWiki\Storage\NameTableStore; +use MediaWiki\Storage\SqlBlobStore; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; use Message; @@ -63,6 +68,7 @@ use Wikimedia\Rdbms\ILoadBalancer; * Service for looking up page revisions. * * @since 1.31 + * @since 1.32 Renamed from MediaWiki\Storage\RevisionStore * * @note This was written to act as a drop-in replacement for the corresponding * static methods in Revision. @@ -2777,3 +2783,9 @@ class RevisionStore // TODO: move relevant methods from Title here, e.g. getFirstRevision, isBigDeletion, etc. } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.32 + */ +class_alias( RevisionStore::class, 'MediaWiki\Storage\RevisionStore' ); diff --git a/includes/Storage/RevisionStoreFactory.php b/includes/Revision/RevisionStoreFactory.php similarity index 97% rename from includes/Storage/RevisionStoreFactory.php rename to includes/Revision/RevisionStoreFactory.php index aaaafc15d1..30ffc997ef 100644 --- a/includes/Storage/RevisionStoreFactory.php +++ b/includes/Revision/RevisionStoreFactory.php @@ -23,11 +23,13 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; use ActorMigration; use CommentStore; use MediaWiki\Logger\Spi as LoggerSpi; +use MediaWiki\Storage\BlobStoreFactory; +use MediaWiki\Storage\NameTableStoreFactory; use WANObjectCache; use Wikimedia\Assert\Assert; use Wikimedia\Rdbms\ILBFactory; diff --git a/includes/Storage/RevisionStoreRecord.php b/includes/Revision/RevisionStoreRecord.php similarity index 96% rename from includes/Storage/RevisionStoreRecord.php rename to includes/Revision/RevisionStoreRecord.php index 6148c44366..955cc82de6 100644 --- a/includes/Storage/RevisionStoreRecord.php +++ b/includes/Revision/RevisionStoreRecord.php @@ -20,7 +20,7 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; use CommentStoreComment; use InvalidArgumentException; @@ -34,6 +34,7 @@ use Wikimedia\Assert\Assert; * RevisionStoreRecord has no optional fields, getters will never return null. * * @since 1.31 + * @since 1.32 Renamed from MediaWiki\Storage\RevisionStoreRecord */ class RevisionStoreRecord extends RevisionRecord { @@ -217,3 +218,9 @@ class RevisionStoreRecord extends RevisionRecord { } } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.32 + */ +class_alias( RevisionStoreRecord::class, 'MediaWiki\Storage\RevisionStoreRecord' ); diff --git a/includes/Storage/SlotRecord.php b/includes/Revision/SlotRecord.php similarity index 98% rename from includes/Storage/SlotRecord.php rename to includes/Revision/SlotRecord.php index ee36d4447c..89980f419f 100644 --- a/includes/Storage/SlotRecord.php +++ b/includes/Revision/SlotRecord.php @@ -20,7 +20,7 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; use Content; use InvalidArgumentException; @@ -34,6 +34,7 @@ use Wikimedia\Assert\Assert; * That access may be implemented through a callback. * * @since 1.31 + * @since 1.32 Renamed from MediaWiki\Storage\SlotRecord */ class SlotRecord { @@ -656,3 +657,9 @@ class SlotRecord { } } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.32 + */ +class_alias( SlotRecord::class, 'MediaWiki\Storage\SlotRecord' ); diff --git a/includes/Revision/SlotRenderingProvider.php b/includes/Revision/SlotRenderingProvider.php index 740f0f2c9f..2c06b312ba 100644 --- a/includes/Revision/SlotRenderingProvider.php +++ b/includes/Revision/SlotRenderingProvider.php @@ -7,7 +7,6 @@ */ namespace MediaWiki\Revision; -use MediaWiki\Storage\SuppressedDataException; use ParserOutput; /** diff --git a/includes/Storage/SuppressedDataException.php b/includes/Revision/SuppressedDataException.php similarity index 78% rename from includes/Storage/SuppressedDataException.php rename to includes/Revision/SuppressedDataException.php index 24f16a6482..b7e60d6049 100644 --- a/includes/Storage/SuppressedDataException.php +++ b/includes/Revision/SuppressedDataException.php @@ -20,14 +20,21 @@ * @file */ -namespace MediaWiki\Storage; +namespace MediaWiki\Revision; /** * Exception raised in response to an audience check when attempting to * access suppressed information without permission. * * @since 1.31 + * @since 1.32 Renamed from MediaWiki\Storage\SuppressedDataException */ class SuppressedDataException extends RevisionAccessException { } + +/** + * Retain the old class name for backwards compatibility. + * @deprecated since 1.32 + */ +class_alias( SuppressedDataException::class, 'MediaWiki\Storage\SuppressedDataException' ); diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index dac3de6934..c1ac932064 100644 --- a/includes/ServiceWiring.php +++ b/includes/ServiceWiring.php @@ -48,16 +48,16 @@ use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; use MediaWiki\Preferences\PreferencesFactory; use MediaWiki\Preferences\DefaultPreferencesFactory; +use MediaWiki\Revision\RevisionFactory; +use MediaWiki\Revision\RevisionLookup; +use MediaWiki\Revision\RevisionRenderer; +use MediaWiki\Revision\RevisionStore; +use MediaWiki\Revision\RevisionStoreFactory; use MediaWiki\Shell\CommandFactory; use MediaWiki\Special\SpecialPageFactory; use MediaWiki\Storage\BlobStore; -use MediaWiki\Revision\RevisionRenderer; use MediaWiki\Storage\BlobStoreFactory; use MediaWiki\Storage\NameTableStoreFactory; -use MediaWiki\Storage\RevisionFactory; -use MediaWiki\Storage\RevisionLookup; -use MediaWiki\Storage\RevisionStore; -use MediaWiki\Storage\RevisionStoreFactory; use MediaWiki\Storage\SqlBlobStore; return [ diff --git a/includes/Storage/DerivedPageDataUpdater.php b/includes/Storage/DerivedPageDataUpdater.php index 3f3b0cfb04..e908968b43 100644 --- a/includes/Storage/DerivedPageDataUpdater.php +++ b/includes/Storage/DerivedPageDataUpdater.php @@ -38,8 +38,13 @@ use LinksDeletionUpdate; use LinksUpdate; use LogicException; use MediaWiki\Edit\PreparedEdit; +use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RenderedRevision; +use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionRenderer; +use MediaWiki\Revision\RevisionSlots; +use MediaWiki\Revision\RevisionStore; +use MediaWiki\Revision\SlotRecord; use MediaWiki\User\UserIdentity; use MessageCache; use ParserCache; diff --git a/includes/Storage/PageUpdater.php b/includes/Storage/PageUpdater.php index 29ce710212..043e00ebf6 100644 --- a/includes/Storage/PageUpdater.php +++ b/includes/Storage/PageUpdater.php @@ -35,6 +35,11 @@ use InvalidArgumentException; use LogicException; use ManualLogEntry; use MediaWiki\Linker\LinkTarget; +use MediaWiki\Revision\MutableRevisionRecord; +use MediaWiki\Revision\RevisionAccessException; +use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Revision\RevisionStore; +use MediaWiki\Revision\SlotRecord; use MWException; use RecentChange; use Revision; diff --git a/includes/Storage/RevisionSlotsUpdate.php b/includes/Storage/RevisionSlotsUpdate.php index d173a3cc1a..a863ad5a51 100644 --- a/includes/Storage/RevisionSlotsUpdate.php +++ b/includes/Storage/RevisionSlotsUpdate.php @@ -23,6 +23,10 @@ namespace MediaWiki\Storage; use Content; +use MediaWiki\Revision\MutableRevisionSlots; +use MediaWiki\Revision\RevisionAccessException; +use MediaWiki\Revision\RevisionSlots; +use MediaWiki\Revision\SlotRecord; /** * Value object representing a modification of revision slots. diff --git a/includes/actions/McrUndoAction.php b/includes/actions/McrUndoAction.php index 6309362ae0..12fd4f4344 100644 --- a/includes/actions/McrUndoAction.php +++ b/includes/actions/McrUndoAction.php @@ -6,9 +6,9 @@ */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\MutableRevisionRecord; -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\SlotRecord; +use MediaWiki\Revision\MutableRevisionRecord; +use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Revision\SlotRecord; /** * Temporary action for MCR undos diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php index c5a2234bb0..76b7bce67b 100644 --- a/includes/api/ApiComparePages.php +++ b/includes/api/ApiComparePages.php @@ -20,10 +20,10 @@ */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\MutableRevisionRecord; -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\RevisionStore; -use MediaWiki\Storage\SlotRecord; +use MediaWiki\Revision\MutableRevisionRecord; +use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Revision\RevisionStore; +use MediaWiki\Revision\SlotRecord; class ApiComparePages extends ApiBase { diff --git a/includes/api/ApiFeedContributions.php b/includes/api/ApiFeedContributions.php index 2b2b32c1be..5bf8da9ff8 100644 --- a/includes/api/ApiFeedContributions.php +++ b/includes/api/ApiFeedContributions.php @@ -21,10 +21,10 @@ */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionAccessException; -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\RevisionStore; -use MediaWiki\Storage\SlotRecord; +use MediaWiki\Revision\RevisionAccessException; +use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Revision\RevisionStore; +use MediaWiki\Revision\SlotRecord; /** * @ingroup API diff --git a/includes/api/ApiQueryAllDeletedRevisions.php b/includes/api/ApiQueryAllDeletedRevisions.php index bae68855f9..7b4f15e517 100644 --- a/includes/api/ApiQueryAllDeletedRevisions.php +++ b/includes/api/ApiQueryAllDeletedRevisions.php @@ -24,8 +24,8 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Revision\RevisionRecord; use MediaWiki\Storage\NameTableAccessException; -use MediaWiki\Storage\RevisionRecord; /** * Query module to enumerate all deleted revisions. diff --git a/includes/api/ApiQueryAllRevisions.php b/includes/api/ApiQueryAllRevisions.php index 833e2e4a1a..6a26eff7f5 100644 --- a/includes/api/ApiQueryAllRevisions.php +++ b/includes/api/ApiQueryAllRevisions.php @@ -21,7 +21,7 @@ */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; /** * Query module to enumerate all revisions. diff --git a/includes/api/ApiQueryContributors.php b/includes/api/ApiQueryContributors.php index e39afac6cf..85f3e4bd2b 100644 --- a/includes/api/ApiQueryContributors.php +++ b/includes/api/ApiQueryContributors.php @@ -24,7 +24,7 @@ */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; /** * A query module to show contributors to a page diff --git a/includes/api/ApiQueryDeletedRevisions.php b/includes/api/ApiQueryDeletedRevisions.php index 47b746a737..8f71c1c4d7 100644 --- a/includes/api/ApiQueryDeletedRevisions.php +++ b/includes/api/ApiQueryDeletedRevisions.php @@ -24,8 +24,8 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Revision\RevisionRecord; use MediaWiki\Storage\NameTableAccessException; -use MediaWiki\Storage\RevisionRecord; /** * Query module to enumerate deleted revisions for pages. diff --git a/includes/api/ApiQueryFilearchive.php b/includes/api/ApiQueryFilearchive.php index a6a325132a..8e464d0195 100644 --- a/includes/api/ApiQueryFilearchive.php +++ b/includes/api/ApiQueryFilearchive.php @@ -24,7 +24,7 @@ * @file */ -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; /** * Query module to enumerate all deleted files. diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php index 01b9c9affb..b1dcf0dba1 100644 --- a/includes/api/ApiQueryRecentChanges.php +++ b/includes/api/ApiQueryRecentChanges.php @@ -21,8 +21,8 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Revision\RevisionRecord; use MediaWiki\Storage\NameTableAccessException; -use MediaWiki\Storage\RevisionRecord; /** * A query action to enumerate the recent changes that were done to the wiki. diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php index 9109a5ea7d..b8a180f2a1 100644 --- a/includes/api/ApiQueryRevisions.php +++ b/includes/api/ApiQueryRevisions.php @@ -21,8 +21,8 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Revision\RevisionRecord; use MediaWiki\Storage\NameTableAccessException; -use MediaWiki\Storage\RevisionRecord; /** * A query action to enumerate revisions of a given page, or show top revisions diff --git a/includes/api/ApiQueryRevisionsBase.php b/includes/api/ApiQueryRevisionsBase.php index e5d7748699..c9f528c36f 100644 --- a/includes/api/ApiQueryRevisionsBase.php +++ b/includes/api/ApiQueryRevisionsBase.php @@ -20,9 +20,9 @@ * @file */ -use MediaWiki\Storage\RevisionAccessException; -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\SlotRecord; +use MediaWiki\Revision\RevisionAccessException; +use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Revision\SlotRecord; use MediaWiki\MediaWikiServices; /** diff --git a/includes/api/ApiQueryUserContribs.php b/includes/api/ApiQueryUserContribs.php index 75670dd445..36d4d341e2 100644 --- a/includes/api/ApiQueryUserContribs.php +++ b/includes/api/ApiQueryUserContribs.php @@ -21,8 +21,8 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Revision\RevisionRecord; use MediaWiki\Storage\NameTableAccessException; -use MediaWiki\Storage\RevisionRecord; /** * This query action adds a list of a specified user's contributions to the output. diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php index 5dd247a3ff..95fbd3de6c 100644 --- a/includes/api/ApiQueryWatchlist.php +++ b/includes/api/ApiQueryWatchlist.php @@ -21,7 +21,7 @@ */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; /** * This query action allows clients to retrieve a list of recently modified pages diff --git a/includes/api/ApiRevisionDelete.php b/includes/api/ApiRevisionDelete.php index 6121c3d338..c636ba1221 100644 --- a/includes/api/ApiRevisionDelete.php +++ b/includes/api/ApiRevisionDelete.php @@ -21,7 +21,7 @@ * @since 1.23 */ -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; /** * API interface to RevDel. The API equivalent of Special:RevisionDelete. diff --git a/includes/api/ApiTag.php b/includes/api/ApiTag.php index e0c7a288e5..82cf986b4e 100644 --- a/includes/api/ApiTag.php +++ b/includes/api/ApiTag.php @@ -20,7 +20,7 @@ */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionStore; +use MediaWiki\Revision\RevisionStore; /** * @ingroup API diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index 936f6bfda4..f8f3d1cfc0 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -21,8 +21,8 @@ * @ingroup DifferenceEngine */ -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\SlotRecord; +use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Revision\SlotRecord; /** * DifferenceEngine is responsible for rendering the difference between two revisions as HTML. diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php b/includes/jobqueue/jobs/RefreshLinksJob.php index 66f54b9420..3488eb6309 100644 --- a/includes/jobqueue/jobs/RefreshLinksJob.php +++ b/includes/jobqueue/jobs/RefreshLinksJob.php @@ -21,7 +21,7 @@ * @ingroup JobQueue */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; /** * Job to update link tables for pages diff --git a/includes/page/Article.php b/includes/page/Article.php index 4a689d318a..5e4da06fdf 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -20,9 +20,9 @@ * @file */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\MutableRevisionRecord; -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\SlotRecord; +use MediaWiki\Revision\MutableRevisionRecord; +use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Revision\SlotRecord; /** * Class for viewing MediaWiki article and history. diff --git a/includes/page/PageArchive.php b/includes/page/PageArchive.php index dfc7c02f05..e843cf38da 100644 --- a/includes/page/PageArchive.php +++ b/includes/page/PageArchive.php @@ -19,8 +19,8 @@ */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\RevisionStore; +use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Revision\RevisionStore; use MediaWiki\Storage\SqlBlobStore; use Wikimedia\Assert\Assert; use Wikimedia\Rdbms\IResultWrapper; diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 7c97465389..a7adb85fe6 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -23,13 +23,13 @@ use MediaWiki\Edit\PreparedEdit; use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; +use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionRenderer; +use MediaWiki\Revision\RevisionStore; +use MediaWiki\Revision\SlotRecord; use MediaWiki\Storage\DerivedPageDataUpdater; use MediaWiki\Storage\PageUpdater; -use MediaWiki\Storage\RevisionRecord; use MediaWiki\Storage\RevisionSlotsUpdate; -use MediaWiki\Storage\RevisionStore; -use MediaWiki\Storage\SlotRecord; use Wikimedia\Assert\Assert; use Wikimedia\Rdbms\FakeResultWrapper; use Wikimedia\Rdbms\IDatabase; diff --git a/includes/poolcounter/PoolWorkArticleView.php b/includes/poolcounter/PoolWorkArticleView.php index 6e6a574074..2c9fbc8775 100644 --- a/includes/poolcounter/PoolWorkArticleView.php +++ b/includes/poolcounter/PoolWorkArticleView.php @@ -19,11 +19,11 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Revision\MutableRevisionRecord; +use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionRenderer; -use MediaWiki\Storage\MutableRevisionRecord; -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\RevisionStore; -use MediaWiki\Storage\SlotRecord; +use MediaWiki\Revision\RevisionStore; +use MediaWiki\Revision\SlotRecord; class PoolWorkArticleView extends PoolCounterWork { /** @var WikiPage */ diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index a92982040b..e4e513e3c3 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -22,7 +22,7 @@ */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionRecord; +use MediaWiki\Revision\RevisionRecord; use Wikimedia\Rdbms\IResultWrapper; /** diff --git a/maintenance/edit.php b/maintenance/edit.php index eb03b381c9..d4a7befd75 100644 --- a/maintenance/edit.php +++ b/maintenance/edit.php @@ -21,7 +21,7 @@ * @ingroup Maintenance */ -use MediaWiki\Storage\SlotRecord; +use MediaWiki\Revision\SlotRecord; require_once __DIR__ . '/Maintenance.php'; diff --git a/maintenance/populateContentTables.php b/maintenance/populateContentTables.php index 93d5baf8d0..644ff87ee8 100644 --- a/maintenance/populateContentTables.php +++ b/maintenance/populateContentTables.php @@ -20,8 +20,8 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Revision\SlotRecord; use MediaWiki\Storage\NameTableStore; -use MediaWiki\Storage\SlotRecord; use MediaWiki\Storage\SqlBlobStore; use Wikimedia\Assert\Assert; use Wikimedia\Rdbms\IDatabase; diff --git a/maintenance/storage/dumpRev.php b/maintenance/storage/dumpRev.php index 0f0073cb38..b00db2083d 100644 --- a/maintenance/storage/dumpRev.php +++ b/maintenance/storage/dumpRev.php @@ -22,7 +22,7 @@ */ use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\SlotRecord; +use MediaWiki\Revision\SlotRecord; require_once __DIR__ . '/../Maintenance.php'; diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php index 8385d7acee..41f3192396 100644 --- a/tests/common/TestsAutoLoader.php +++ b/tests/common/TestsAutoLoader.php @@ -157,15 +157,15 @@ $wgAutoloadClasses += [ 'SpecialPageTestBase' => "$testDir/phpunit/includes/specials/SpecialPageTestBase.php", 'SpecialPageExecutor' => "$testDir/phpunit/includes/specials/SpecialPageExecutor.php", - # tests/phpunit/includes/Storage - 'MediaWiki\Tests\Storage\McrSchemaDetection' => "$testDir/phpunit/includes/Storage/McrSchemaDetection.php", - 'MediaWiki\Tests\Storage\McrSchemaOverride' => "$testDir/phpunit/includes/Storage/McrSchemaOverride.php", - 'MediaWiki\Tests\Storage\McrWriteBothSchemaOverride' => "$testDir/phpunit/includes/Storage/McrWriteBothSchemaOverride.php", - 'MediaWiki\Tests\Storage\McrReadNewSchemaOverride' => "$testDir/phpunit/includes/Storage/McrReadNewSchemaOverride.php", - 'MediaWiki\Tests\Storage\RevisionSlotsTest' => "$testDir/phpunit/includes/Storage/RevisionSlotsTest.php", - 'MediaWiki\Tests\Storage\RevisionRecordTests' => "$testDir/phpunit/includes/Storage/RevisionRecordTests.php", - 'MediaWiki\Tests\Storage\RevisionStoreDbTestBase' => "$testDir/phpunit/includes/Storage/RevisionStoreDbTestBase.php", - 'MediaWiki\Tests\Storage\PreMcrSchemaOverride' => "$testDir/phpunit/includes/Storage/PreMcrSchemaOverride.php", + # tests/phpunit/includes/Revision + 'MediaWiki\Tests\Revision\McrSchemaDetection' => "$testDir/phpunit/includes/Revision/McrSchemaDetection.php", + 'MediaWiki\Tests\Revision\McrSchemaOverride' => "$testDir/phpunit/includes/Revision/McrSchemaOverride.php", + 'MediaWiki\Tests\Revision\McrWriteBothSchemaOverride' => "$testDir/phpunit/includes/Revision/McrWriteBothSchemaOverride.php", + 'MediaWiki\Tests\Revision\McrReadNewSchemaOverride' => "$testDir/phpunit/includes/Revision/McrReadNewSchemaOverride.php", + 'MediaWiki\Tests\Revision\RevisionSlotsTest' => "$testDir/phpunit/includes/Revision/RevisionSlotsTest.php", + 'MediaWiki\Tests\Revision\RevisionRecordTests' => "$testDir/phpunit/includes/Revision/RevisionRecordTests.php", + 'MediaWiki\Tests\Revision\RevisionStoreDbTestBase' => "$testDir/phpunit/includes/Revision/RevisionStoreDbTestBase.php", + 'MediaWiki\Tests\Revision\PreMcrSchemaOverride' => "$testDir/phpunit/includes/Revision/PreMcrSchemaOverride.php", # tests/phpunit/languages 'LanguageClassesTestCase' => "$testDir/phpunit/languages/LanguageClassesTestCase.php", diff --git a/tests/phpunit/includes/Storage/McrReadNewRevisionStoreDbTest.php b/tests/phpunit/includes/Revision/McrReadNewRevisionStoreDbTest.php similarity index 95% rename from tests/phpunit/includes/Storage/McrReadNewRevisionStoreDbTest.php rename to tests/phpunit/includes/Revision/McrReadNewRevisionStoreDbTest.php index 3b3b3441a1..3efd372e07 100644 --- a/tests/phpunit/includes/Storage/McrReadNewRevisionStoreDbTest.php +++ b/tests/phpunit/includes/Revision/McrReadNewRevisionStoreDbTest.php @@ -1,10 +1,10 @@ setExpectedException( InvalidArgumentException::class ); diff --git a/tests/phpunit/includes/Storage/NoContentModelRevisionStoreDbTest.php b/tests/phpunit/includes/Revision/NoContentModelRevisionStoreDbTest.php similarity index 97% rename from tests/phpunit/includes/Storage/NoContentModelRevisionStoreDbTest.php rename to tests/phpunit/includes/Revision/NoContentModelRevisionStoreDbTest.php index 7e1e1ee919..59481f087b 100644 --- a/tests/phpunit/includes/Storage/NoContentModelRevisionStoreDbTest.php +++ b/tests/phpunit/includes/Revision/NoContentModelRevisionStoreDbTest.php @@ -1,12 +1,12 @@ setMwGlobals( $migrationStageSettings ); @@ -1078,7 +1078,7 @@ class RevisionQueryInfoTest extends MediaWikiTestCase { /** * @dataProvider provideSlotsQueryInfo - * @covers \MediaWiki\Storage\RevisionStore::getSlotsQueryInfo + * @covers \MediaWiki\Revision\RevisionStore::getSlotsQueryInfo */ public function testRevisionStoreGetSlotsQueryInfo( $migrationStageSettings, @@ -1096,7 +1096,7 @@ class RevisionQueryInfoTest extends MediaWikiTestCase { /** * @dataProvider provideArchiveQueryInfo - * @covers \MediaWiki\Storage\RevisionStore::getArchiveQueryInfo + * @covers \MediaWiki\Revision\RevisionStore::getArchiveQueryInfo */ public function testRevisionStoreGetArchiveQueryInfo( $migrationStageSettings, $expected ) { $this->setMwGlobals( $migrationStageSettings ); diff --git a/tests/phpunit/includes/Storage/RevisionRecordTests.php b/tests/phpunit/includes/Revision/RevisionRecordTests.php similarity index 96% rename from tests/phpunit/includes/Storage/RevisionRecordTests.php rename to tests/phpunit/includes/Revision/RevisionRecordTests.php index 901b80022c..a53ceccd83 100644 --- a/tests/phpunit/includes/Storage/RevisionRecordTests.php +++ b/tests/phpunit/includes/Revision/RevisionRecordTests.php @@ -2,21 +2,21 @@ // phpcs:disable MediaWiki.Commenting.PhpunitAnnotations.NotClassTrait -namespace MediaWiki\Tests\Storage; +namespace MediaWiki\Tests\Revision; use CommentStoreComment; use LogicException; -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\RevisionSlots; -use MediaWiki\Storage\RevisionStoreRecord; -use MediaWiki\Storage\SlotRecord; -use MediaWiki\Storage\SuppressedDataException; +use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Revision\RevisionSlots; +use MediaWiki\Revision\RevisionStoreRecord; +use MediaWiki\Revision\SlotRecord; +use MediaWiki\Revision\SuppressedDataException; use MediaWiki\User\UserIdentityValue; use TextContent; use Title; /** - * @covers \MediaWiki\Storage\RevisionRecord + * @covers \MediaWiki\Revision\RevisionRecord * * @note Expects to be used in classes that extend MediaWikiTestCase. */ @@ -360,7 +360,7 @@ trait RevisionRecordTests { /** * @dataProvider provideUserCanBitfield - * @covers \MediaWiki\Storage\RevisionRecord::userCanBitfield + * @covers \MediaWiki\Revision\RevisionRecord::userCanBitfield */ public function testUserCanBitfield( $bitField, $field, $userGroups, $title, $expected ) { if ( is_string( $title ) ) { @@ -450,7 +450,7 @@ trait RevisionRecordTests { /** * @dataProvider provideHasSameContent - * @covers \MediaWiki\Storage\RevisionRecord::hasSameContent + * @covers \MediaWiki\Revision\RevisionRecord::hasSameContent * @group Database */ public function testHasSameContent( @@ -511,7 +511,7 @@ trait RevisionRecordTests { /** * @dataProvider provideIsDeleted - * @covers \MediaWiki\Storage\RevisionRecord::isDeleted + * @covers \MediaWiki\Revision\RevisionRecord::isDeleted */ public function testIsDeleted( $revDeleted, $assertionMap ) { $rev = $this->newRevision( [ 'rev_deleted' => $revDeleted ] ); diff --git a/tests/phpunit/includes/Revision/RevisionRendererTest.php b/tests/phpunit/includes/Revision/RevisionRendererTest.php index ca13899d41..469f2816dd 100644 --- a/tests/phpunit/includes/Revision/RevisionRendererTest.php +++ b/tests/phpunit/includes/Revision/RevisionRendererTest.php @@ -6,12 +6,12 @@ use CommentStoreComment; use Content; use Language; use LogicException; +use MediaWiki\Revision\MutableRevisionRecord; +use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionRenderer; -use MediaWiki\Storage\MutableRevisionRecord; -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\SlotRecord; -use MediaWiki\User\UserIdentityValue; +use MediaWiki\Revision\SlotRecord; use MediaWikiTestCase; +use MediaWiki\User\UserIdentityValue; use ParserOptions; use ParserOutput; use PHPUnit\Framework\MockObject\MockObject; diff --git a/tests/phpunit/includes/Storage/RevisionSlotsTest.php b/tests/phpunit/includes/Revision/RevisionSlotsTest.php similarity index 88% rename from tests/phpunit/includes/Storage/RevisionSlotsTest.php rename to tests/phpunit/includes/Revision/RevisionSlotsTest.php index 409e002cc1..d8e7d92b58 100644 --- a/tests/phpunit/includes/Storage/RevisionSlotsTest.php +++ b/tests/phpunit/includes/Revision/RevisionSlotsTest.php @@ -1,11 +1,11 @@ setExpectedException( InvalidArgumentException::class ); @@ -43,7 +43,7 @@ class RevisionSlotsTest extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionSlots::getSlot + * @covers \MediaWiki\Revision\RevisionSlots::getSlot */ public function testGetSlot() { $mainSlot = SlotRecord::newUnsaved( SlotRecord::MAIN, new WikitextContent( 'A' ) ); @@ -57,7 +57,7 @@ class RevisionSlotsTest extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionSlots::hasSlot + * @covers \MediaWiki\Revision\RevisionSlots::hasSlot */ public function testHasSlot() { $mainSlot = SlotRecord::newUnsaved( SlotRecord::MAIN, new WikitextContent( 'A' ) ); @@ -71,7 +71,7 @@ class RevisionSlotsTest extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionSlots::getContent + * @covers \MediaWiki\Revision\RevisionSlots::getContent */ public function testGetContent() { $mainContent = new WikitextContent( 'A' ); @@ -87,7 +87,7 @@ class RevisionSlotsTest extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionSlots::getSlotRoles + * @covers \MediaWiki\Revision\RevisionSlots::getSlotRoles */ public function testGetSlotRoles_someSlots() { $mainSlot = SlotRecord::newUnsaved( SlotRecord::MAIN, new WikitextContent( 'A' ) ); @@ -98,7 +98,7 @@ class RevisionSlotsTest extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionSlots::getSlotRoles + * @covers \MediaWiki\Revision\RevisionSlots::getSlotRoles */ public function testGetSlotRoles_noSlots() { $slots = $this->newRevisionSlots( [] ); @@ -107,7 +107,7 @@ class RevisionSlotsTest extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionSlots::getSlots + * @covers \MediaWiki\Revision\RevisionSlots::getSlots */ public function testGetSlots() { $mainSlot = SlotRecord::newUnsaved( SlotRecord::MAIN, new WikitextContent( 'A' ) ); @@ -119,7 +119,7 @@ class RevisionSlotsTest extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionSlots::getInheritedSlots + * @covers \MediaWiki\Revision\RevisionSlots::getInheritedSlots */ public function testGetInheritedSlots() { $mainSlot = SlotRecord::newUnsaved( SlotRecord::MAIN, new WikitextContent( 'A' ) ); @@ -136,7 +136,7 @@ class RevisionSlotsTest extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionSlots::getOriginalSlots + * @covers \MediaWiki\Revision\RevisionSlots::getOriginalSlots */ public function testGetOriginalSlots() { $mainSlot = SlotRecord::newUnsaved( SlotRecord::MAIN, new WikitextContent( 'A' ) ); @@ -160,7 +160,7 @@ class RevisionSlotsTest extends MediaWikiTestCase { /** * @dataProvider provideComputeSize - * @covers \MediaWiki\Storage\RevisionSlots::computeSize + * @covers \MediaWiki\Revision\RevisionSlots::computeSize */ public function testComputeSize( $expected, $contentStrings ) { $slotsArray = []; @@ -180,7 +180,7 @@ class RevisionSlotsTest extends MediaWikiTestCase { /** * @dataProvider provideComputeSha1 - * @covers \MediaWiki\Storage\RevisionSlots::computeSha1 + * @covers \MediaWiki\Revision\RevisionSlots::computeSha1 * @note this test is a bit brittle as the hashes are hardcoded, perhaps just check that strings * are returned and different Slots objects return different strings? */ @@ -217,7 +217,7 @@ class RevisionSlotsTest extends MediaWikiTestCase { /** * @dataProvider provideHasSameContent - * @covers \MediaWiki\Storage\RevisionSlots::hasSameContent + * @covers \MediaWiki\Revision\RevisionSlots::hasSameContent */ public function testHasSameContent( RevisionSlots $a, RevisionSlots $b, $same ) { $this->assertSame( $same, $a->hasSameContent( $b ) ); @@ -247,7 +247,7 @@ class RevisionSlotsTest extends MediaWikiTestCase { /** * @dataProvider provideGetRolesWithDifferentContent - * @covers \MediaWiki\Storage\RevisionSlots::getRolesWithDifferentContent + * @covers \MediaWiki\Revision\RevisionSlots::getRolesWithDifferentContent */ public function testGetRolesWithDifferentContent( RevisionSlots $a, RevisionSlots $b, $roles ) { $this->assertArrayEquals( $roles, $a->getRolesWithDifferentContent( $b ) ); diff --git a/tests/phpunit/includes/Storage/RevisionStoreDbTestBase.php b/tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php similarity index 94% rename from tests/phpunit/includes/Storage/RevisionStoreDbTestBase.php rename to tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php index 04b6aa82b2..355d2cef34 100644 --- a/tests/phpunit/includes/Storage/RevisionStoreDbTestBase.php +++ b/tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php @@ -1,6 +1,6 @@ setMwGlobals( @@ -384,9 +384,9 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { /** * @dataProvider provideInsertRevisionOn_successes - * @covers \MediaWiki\Storage\RevisionStore::insertRevisionOn - * @covers \MediaWiki\Storage\RevisionStore::insertSlotRowOn - * @covers \MediaWiki\Storage\RevisionStore::insertContentRowOn + * @covers \MediaWiki\Revision\RevisionStore::insertRevisionOn + * @covers \MediaWiki\Revision\RevisionStore::insertSlotRowOn + * @covers \MediaWiki\Revision\RevisionStore::insertContentRowOn */ public function testInsertRevisionOn_successes( array $revDetails = [] @@ -449,7 +449,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::insertRevisionOn + * @covers \MediaWiki\Revision\RevisionStore::insertRevisionOn */ public function testInsertRevisionOn_blobAddressExists() { $title = $this->getTestPageTitle(); @@ -536,7 +536,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { /** * @dataProvider provideInsertRevisionOn_failures - * @covers \MediaWiki\Storage\RevisionStore::insertRevisionOn + * @covers \MediaWiki\Revision\RevisionStore::insertRevisionOn */ public function testInsertRevisionOn_failures( array $revDetails = [], @@ -571,8 +571,8 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { /** * @dataProvider provideNewNullRevision - * @covers \MediaWiki\Storage\RevisionStore::newNullRevision - * @covers \MediaWiki\Storage\RevisionStore::findSlotContentId + * @covers \MediaWiki\Revision\RevisionStore::newNullRevision + * @covers \MediaWiki\Revision\RevisionStore::findSlotContentId */ public function testNewNullRevision( Title $title, $revDetails, $comment, $minor = false ) { $this->overrideMwServices(); @@ -627,7 +627,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::newNullRevision + * @covers \MediaWiki\Revision\RevisionStore::newNullRevision */ public function testNewNullRevision_nonExistingTitle() { $store = MediaWikiServices::getInstance()->getRevisionStore(); @@ -642,7 +642,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::getRcIdIfUnpatrolled + * @covers \MediaWiki\Revision\RevisionStore::getRcIdIfUnpatrolled */ public function testGetRcIdIfUnpatrolled_returnsRecentChangesId() { $page = $this->getTestPage(); @@ -662,7 +662,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::getRcIdIfUnpatrolled + * @covers \MediaWiki\Revision\RevisionStore::getRcIdIfUnpatrolled */ public function testGetRcIdIfUnpatrolled_returnsZeroIfPatrolled() { // This assumes that sysops are auto patrolled @@ -686,7 +686,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::getRecentChange + * @covers \MediaWiki\Revision\RevisionStore::getRecentChange */ public function testGetRecentChange() { $page = $this->getTestPage(); @@ -704,7 +704,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::getRevisionById + * @covers \MediaWiki\Revision\RevisionStore::getRevisionById */ public function testGetRevisionById() { $page = $this->getTestPage(); @@ -722,7 +722,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::getRevisionByTitle + * @covers \MediaWiki\Revision\RevisionStore::getRevisionByTitle */ public function testGetRevisionByTitle() { $page = $this->getTestPage(); @@ -740,7 +740,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::getRevisionByPageId + * @covers \MediaWiki\Revision\RevisionStore::getRevisionByPageId */ public function testGetRevisionByPageId() { $page = $this->getTestPage(); @@ -758,7 +758,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::getRevisionByTimestamp + * @covers \MediaWiki\Revision\RevisionStore::getRevisionByTimestamp */ public function testGetRevisionByTimestamp() { // Make sure there is 1 second between the last revision and the rev we create... @@ -883,8 +883,8 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromRow - * @covers \MediaWiki\Storage\RevisionStore::getQueryInfo + * @covers \MediaWiki\Revision\RevisionStore::newRevisionFromRow + * @covers \MediaWiki\Revision\RevisionStore::getQueryInfo */ public function testNewRevisionFromRow_getQueryInfo() { $page = $this->getTestPage(); @@ -915,7 +915,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromRow + * @covers \MediaWiki\Revision\RevisionStore::newRevisionFromRow */ public function testNewRevisionFromRow_anonEdit() { $page = $this->getTestPage(); @@ -937,7 +937,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromRow + * @covers \MediaWiki\Revision\RevisionStore::newRevisionFromRow */ public function testNewRevisionFromRow_anonEdit_legacyEncoding() { $this->setMwGlobals( 'wgLegacyEncoding', 'windows-1252' ); @@ -961,7 +961,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromRow + * @covers \MediaWiki\Revision\RevisionStore::newRevisionFromRow */ public function testNewRevisionFromRow_userEdit() { $page = $this->getTestPage(); @@ -986,8 +986,8 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromArchiveRow - * @covers \MediaWiki\Storage\RevisionStore::getArchiveQueryInfo + * @covers \MediaWiki\Revision\RevisionStore::newRevisionFromArchiveRow + * @covers \MediaWiki\Revision\RevisionStore::getArchiveQueryInfo */ public function testNewRevisionFromArchiveRow_getArchiveQueryInfo() { $store = MediaWikiServices::getInstance()->getRevisionStore(); @@ -1016,7 +1016,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromArchiveRow + * @covers \MediaWiki\Revision\RevisionStore::newRevisionFromArchiveRow */ public function testNewRevisionFromArchiveRow_legacyEncoding() { $this->setMwGlobals( 'wgLegacyEncoding', 'windows-1252' ); @@ -1047,7 +1047,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromArchiveRow + * @covers \MediaWiki\Revision\RevisionStore::newRevisionFromArchiveRow */ public function testNewRevisionFromArchiveRow_no_user() { $store = MediaWikiServices::getInstance()->getRevisionStore(); @@ -1085,7 +1085,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromRow + * @covers \MediaWiki\Revision\RevisionStore::newRevisionFromRow */ public function testNewRevisionFromRow_no_user() { $store = MediaWikiServices::getInstance()->getRevisionStore(); @@ -1123,7 +1123,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::insertRevisionOn + * @covers \MediaWiki\Revision\RevisionStore::insertRevisionOn */ public function testInsertRevisionOn_archive() { // This is a round trip test for deletion and undeletion of a @@ -1184,7 +1184,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::loadRevisionFromId + * @covers \MediaWiki\Revision\RevisionStore::loadRevisionFromId */ public function testLoadRevisionFromId() { $title = Title::newFromText( __METHOD__ ); @@ -1199,7 +1199,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::loadRevisionFromPageId + * @covers \MediaWiki\Revision\RevisionStore::loadRevisionFromPageId */ public function testLoadRevisionFromPageId() { $title = Title::newFromText( __METHOD__ ); @@ -1214,7 +1214,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::loadRevisionFromTitle + * @covers \MediaWiki\Revision\RevisionStore::loadRevisionFromTitle */ public function testLoadRevisionFromTitle() { $title = Title::newFromText( __METHOD__ ); @@ -1229,7 +1229,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::loadRevisionFromTimestamp + * @covers \MediaWiki\Revision\RevisionStore::loadRevisionFromTimestamp */ public function testLoadRevisionFromTimestamp() { $title = Title::newFromText( __METHOD__ ); @@ -1266,7 +1266,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::listRevisionSizes + * @covers \MediaWiki\Revision\RevisionStore::listRevisionSizes */ public function testGetParentLengths() { $page = WikiPage::factory( Title::newFromText( __METHOD__ ) ); @@ -1302,7 +1302,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::getPreviousRevision + * @covers \MediaWiki\Revision\RevisionStore::getPreviousRevision */ public function testGetPreviousRevision() { $page = WikiPage::factory( Title::newFromText( __METHOD__ ) ); @@ -1326,7 +1326,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::getNextRevision + * @covers \MediaWiki\Revision\RevisionStore::getNextRevision */ public function testGetNextRevision() { $page = WikiPage::factory( Title::newFromText( __METHOD__ ) ); @@ -1350,7 +1350,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::getTimestampFromId + * @covers \MediaWiki\Revision\RevisionStore::getTimestampFromId */ public function testGetTimestampFromId_found() { $page = $this->getTestPage(); @@ -1368,7 +1368,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::getTimestampFromId + * @covers \MediaWiki\Revision\RevisionStore::getTimestampFromId */ public function testGetTimestampFromId_notFound() { $page = $this->getTestPage(); @@ -1386,7 +1386,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::countRevisionsByPageId + * @covers \MediaWiki\Revision\RevisionStore::countRevisionsByPageId */ public function testCountRevisionsByPageId() { $store = MediaWikiServices::getInstance()->getRevisionStore(); @@ -1409,7 +1409,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::countRevisionsByTitle + * @covers \MediaWiki\Revision\RevisionStore::countRevisionsByTitle */ public function testCountRevisionsByTitle() { $store = MediaWikiServices::getInstance()->getRevisionStore(); @@ -1432,7 +1432,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::userWasLastToEdit + * @covers \MediaWiki\Revision\RevisionStore::userWasLastToEdit */ public function testUserWasLastToEdit_false() { $sysop = $this->getTestSysop()->getUser(); @@ -1450,7 +1450,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::userWasLastToEdit + * @covers \MediaWiki\Revision\RevisionStore::userWasLastToEdit */ public function testUserWasLastToEdit_true() { $startTime = wfTimestampNow(); @@ -1475,7 +1475,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::getKnownCurrentRevision + * @covers \MediaWiki\Revision\RevisionStore::getKnownCurrentRevision */ public function testGetKnownCurrentRevision() { $page = $this->getTestPage(); @@ -1581,7 +1581,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { /** * @dataProvider provideNewMutableRevisionFromArray - * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray + * @covers \MediaWiki\Revision\RevisionStore::newMutableRevisionFromArray */ public function testNewMutableRevisionFromArray( array $array ) { $store = MediaWikiServices::getInstance()->getRevisionStore(); @@ -1635,7 +1635,7 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { /** * @dataProvider provideNewMutableRevisionFromArray - * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray + * @covers \MediaWiki\Revision\RevisionStore::newMutableRevisionFromArray */ public function testNewMutableRevisionFromArray_legacyEncoding( array $array ) { $cache = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] ); diff --git a/tests/phpunit/includes/Storage/RevisionStoreFactoryTest.php b/tests/phpunit/includes/Revision/RevisionStoreFactoryTest.php similarity index 97% rename from tests/phpunit/includes/Storage/RevisionStoreFactoryTest.php rename to tests/phpunit/includes/Revision/RevisionStoreFactoryTest.php index 1d8771be5c..9904b3bc65 100644 --- a/tests/phpunit/includes/Storage/RevisionStoreFactoryTest.php +++ b/tests/phpunit/includes/Revision/RevisionStoreFactoryTest.php @@ -1,16 +1,16 @@ getMockLoadBalancer(); @@ -416,7 +416,7 @@ class RevisionStoreTest extends MediaWikiTestCase { /** * @dataProvider provideNewRevisionFromRow_legacyEncoding_applied * - * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromRow + * @covers \MediaWiki\Revision\RevisionStore::newRevisionFromRow */ public function testNewRevisionFromRow_legacyEncoding_applied( $encoding, $locale, $row, $text ) { if ( !$this->useTextId() ) { @@ -441,7 +441,7 @@ class RevisionStoreTest extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::newRevisionFromRow + * @covers \MediaWiki\Revision\RevisionStore::newRevisionFromRow */ public function testNewRevisionFromRow_legacyEncoding_ignored() { if ( !$this->useTextId() ) { @@ -526,7 +526,7 @@ class RevisionStoreTest extends MediaWikiTestCase { } /** - * @covers \MediaWiki\Storage\RevisionStore::__construct + * @covers \MediaWiki\Revision\RevisionStore::__construct * @dataProvider provideMigrationConstruction */ public function testMigrationConstruction( $migration, $expectException ) { diff --git a/tests/phpunit/includes/Storage/SlotRecordTest.php b/tests/phpunit/includes/Revision/SlotRecordTest.php similarity index 98% rename from tests/phpunit/includes/Storage/SlotRecordTest.php rename to tests/phpunit/includes/Revision/SlotRecordTest.php index 0db294e675..ea26808355 100644 --- a/tests/phpunit/includes/Storage/SlotRecordTest.php +++ b/tests/phpunit/includes/Revision/SlotRecordTest.php @@ -1,17 +1,17 @@ getMockTitle() ); @@ -82,7 +82,7 @@ class RevisionTest extends MediaWikiTestCase { /** * @covers Revision::__construct - * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray + * @covers \MediaWiki\Revision\RevisionStore::newMutableRevisionFromArray */ public function testConstructFromEmptyArray() { $rev = new Revision( [], 0, $this->getMockTitle() ); @@ -91,7 +91,7 @@ class RevisionTest extends MediaWikiTestCase { /** * @covers Revision::__construct - * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray + * @covers \MediaWiki\Revision\RevisionStore::newMutableRevisionFromArray */ public function testConstructFromArrayWithBadPageId() { Wikimedia\suppressWarnings(); @@ -131,7 +131,7 @@ class RevisionTest extends MediaWikiTestCase { /** * @dataProvider provideConstructFromArray_userSetAsExpected * @covers Revision::__construct - * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray + * @covers \MediaWiki\Revision\RevisionStore::newMutableRevisionFromArray * * @param array $rowArray * @param mixed $expectedUserId null to expect the current wgUser ID @@ -184,7 +184,7 @@ class RevisionTest extends MediaWikiTestCase { /** * @dataProvider provideConstructFromArrayThrowsExceptions * @covers Revision::__construct - * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray + * @covers \MediaWiki\Revision\RevisionStore::newMutableRevisionFromArray */ public function testConstructFromArrayThrowsExceptions( $rowArray, Exception $expectedException ) { $this->setExpectedException( @@ -197,7 +197,7 @@ class RevisionTest extends MediaWikiTestCase { /** * @covers Revision::__construct - * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray + * @covers \MediaWiki\Revision\RevisionStore::newMutableRevisionFromArray */ public function testConstructFromNothing() { $this->setExpectedException( @@ -268,7 +268,7 @@ class RevisionTest extends MediaWikiTestCase { /** * @dataProvider provideConstructFromRow * @covers Revision::__construct - * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray + * @covers \MediaWiki\Revision\RevisionStore::newMutableRevisionFromArray */ public function testConstructFromRow( array $arrayData, callable $assertions ) { $row = (object)$arrayData; @@ -278,7 +278,7 @@ class RevisionTest extends MediaWikiTestCase { /** * @covers Revision::__construct - * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray + * @covers \MediaWiki\Revision\RevisionStore::newMutableRevisionFromArray */ public function testConstructFromRowWithBadPageId() { $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD ); diff --git a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php index 18f039d20e..c175e2fd09 100644 --- a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php +++ b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php @@ -7,12 +7,12 @@ use Content; use ContentHandler; use LinksUpdate; use MediaWiki\MediaWikiServices; +use MediaWiki\Revision\MutableRevisionRecord; +use MediaWiki\Revision\MutableRevisionSlots; +use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Revision\SlotRecord; use MediaWiki\Storage\DerivedPageDataUpdater; -use MediaWiki\Storage\MutableRevisionRecord; -use MediaWiki\Storage\MutableRevisionSlots; -use MediaWiki\Storage\RevisionRecord; use MediaWiki\Storage\RevisionSlotsUpdate; -use MediaWiki\Storage\SlotRecord; use MediaWikiTestCase; use MWCallableUpdate; use MWTimestamp; diff --git a/tests/phpunit/includes/Storage/PageUpdaterTest.php b/tests/phpunit/includes/Storage/PageUpdaterTest.php index 393398622c..3ba90327ec 100644 --- a/tests/phpunit/includes/Storage/PageUpdaterTest.php +++ b/tests/phpunit/includes/Storage/PageUpdaterTest.php @@ -5,8 +5,8 @@ namespace MediaWiki\Tests\Storage; use CommentStoreComment; use Content; use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\RevisionRecord; -use MediaWiki\Storage\SlotRecord; +use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Revision\SlotRecord; use MediaWikiTestCase; use ParserOptions; use RecentChange; diff --git a/tests/phpunit/includes/Storage/RevisionSlotsUpdateTest.php b/tests/phpunit/includes/Storage/RevisionSlotsUpdateTest.php index 75a4718ac2..442f4d2d33 100644 --- a/tests/phpunit/includes/Storage/RevisionSlotsUpdateTest.php +++ b/tests/phpunit/includes/Storage/RevisionSlotsUpdateTest.php @@ -3,11 +3,11 @@ namespace MediaWiki\Tests\Storage; use Content; -use MediaWiki\Storage\MutableRevisionSlots; -use MediaWiki\Storage\RevisionSlots; +use MediaWiki\Revision\MutableRevisionSlots; +use MediaWiki\Revision\RevisionSlots; +use MediaWiki\Revision\RevisionAccessException; +use MediaWiki\Revision\SlotRecord; use MediaWiki\Storage\RevisionSlotsUpdate; -use MediaWiki\Storage\RevisionAccessException; -use MediaWiki\Storage\SlotRecord; use MediaWikiTestCase; use WikitextContent; diff --git a/tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php b/tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php index 8e2c6d95d5..41ecd52944 100644 --- a/tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php +++ b/tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php @@ -2,7 +2,7 @@ use MediaWiki\Linker\LinkTarget; use MediaWiki\MediaWikiServices; -use MediaWiki\Storage\SlotRecord; +use MediaWiki\Revision\SlotRecord; /** * @group medium diff --git a/tests/phpunit/includes/content/WikitextContentHandlerTest.php b/tests/phpunit/includes/content/WikitextContentHandlerTest.php index e469f1232b..31d90cb568 100644 --- a/tests/phpunit/includes/content/WikitextContentHandlerTest.php +++ b/tests/phpunit/includes/content/WikitextContentHandlerTest.php @@ -1,8 +1,8 @@