From 15a278189fc6fc290ad5ec75f3800fd9e481ba0e Mon Sep 17 00:00:00 2001 From: Amir Sarabadani Date: Sat, 19 Aug 2023 05:35:06 +0200 Subject: [PATCH] Reorg: Move MWTimestamp to MediaWiki\Utils Bug: T321882 Change-Id: I48c10343295c4eb3d9ef8037343b0070e928f040 --- autoload.php | 3 ++- includes/GlobalFunctions.php | 1 + includes/Hook/GetRelativeTimestampHook.php | 2 +- includes/OutputPage.php | 1 + includes/Rest/Handler/UpdateHandler.php | 2 +- includes/Revision/MutableRevisionRecord.php | 2 +- includes/Revision/RevisionArchiveRecord.php | 2 +- includes/Revision/RevisionStore.php | 2 +- includes/Revision/RevisionStoreRecord.php | 2 +- includes/Storage/DerivedPageDataUpdater.php | 2 +- includes/actions/HistoryAction.php | 1 + includes/actions/RevertAction.php | 1 + includes/api/ApiBlockInfoTrait.php | 1 + includes/api/ApiCheckToken.php | 1 + includes/api/ApiMain.php | 1 + includes/api/ApiQueryUserInfo.php | 1 + includes/changes/RecentChange.php | 1 + includes/filerepo/FileRepo.php | 1 + .../htmlform/fields/HTMLTimezoneField.php | 1 + .../language/Hook/GetHumanTimestampHook.php | 2 +- includes/language/Language.php | 1 + .../libs/filebackend/SwiftFileBackend.php | 1 + includes/mail/UserMailer.php | 1 + includes/page/MergeHistory.php | 2 +- includes/page/PageStoreRecord.php | 2 +- includes/page/WikiPage.php | 1 + includes/pager/RangeChronologicalPager.php | 2 ++ includes/pager/ReverseChronologicalPager.php | 1 + includes/parser/CacheTime.php | 1 + includes/parser/CoreMagicVariables.php | 1 + includes/parser/Parser.php | 1 + includes/parser/ParserOptions.php | 1 + includes/parser/RevisionOutputCache.php | 2 +- .../PoolWorkArticleViewCurrent.php | 1 + includes/session/SessionManager.php | 2 +- includes/specials/SpecialLog.php | 2 +- includes/specials/SpecialRecentChanges.php | 1 + includes/specials/SpecialVersion.php | 1 + includes/specials/pagers/BlockListPager.php | 1 + includes/title/Title.php | 2 +- includes/user/TalkPageNotificationManager.php | 2 +- includes/user/UserTimeCorrection.php | 2 +- includes/{ => utils}/MWTimestamp.php | 25 +++++++++++++------ includes/watcheditem/WatchedItem.php | 1 + includes/watcheditem/WatchedItemStore.php | 1 + includes/xml/Xml.php | 1 + maintenance/categoryChangesAsRdf.php | 1 + maintenance/wikiBirthday.php | 1 + tests/parser/ParserTestRunner.php | 1 + tests/phpunit/includes/EditPageTest.php | 1 + tests/phpunit/includes/MWTimestampTest.php | 1 + tests/phpunit/includes/OutputPageTest.php | 1 + .../Revision/ArchivedRevisionLookupTest.php | 2 +- .../includes/Revision/RevisionStoreDbTest.php | 2 +- .../includes/Revision/RevisionStoreTest.php | 2 +- .../Storage/DerivedPageDataUpdaterTest.php | 2 +- tests/phpunit/includes/TitleTest.php | 1 + tests/phpunit/includes/api/ApiBlockTest.php | 1 + .../phpunit/includes/api/ApiEditPageTest.php | 1 + .../api/query/ApiQueryImageInfoTest.php | 1 + .../api/query/ApiQueryUserInfoTest.php | 2 ++ .../changes/EnhancedChangesListTest.php | 1 + .../includes/changes/RecentChangeTest.php | 1 + .../jobs/CategoryMembershipChangeJobTest.php | 1 + .../phpunit/includes/page/ArticleViewTest.php | 1 + .../includes/page/ParserOutputAccessTest.php | 1 + .../phpunit/includes/page/WikiPageDbTest.php | 1 + .../pager/ReverseChronologicalPagerTest.php | 1 + .../phpunit/includes/parser/CacheTimeTest.php | 2 +- .../ParserCacheSerializationTestCases.php | 2 +- .../includes/parser/ParserCacheTest.php | 2 +- .../includes/parser/ParserOutputTest.php | 1 + .../parser/RevisionOutputCacheTest.php | 2 +- .../includes/session/SessionManagerTest.php | 2 +- .../specialpage/FormSpecialPageTestCase.php | 1 + .../specials/pagers/BlockListPagerTest.php | 1 + .../user/TalkPageNotificationManagerTest.php | 1 + .../includes/user/UserGroupManagerTest.php | 2 +- tests/phpunit/includes/user/UserTest.php | 1 + .../Helper/HtmlOutputRendererHelperTest.php | 2 +- .../Rest/Handler/PageHTMLHandlerTest.php | 2 +- .../Rest/Handler/RevisionHTMLHandlerTest.php | 2 +- .../maintenance/CategoryChangesAsRdfTest.php | 1 + 83 files changed, 103 insertions(+), 37 deletions(-) rename includes/{ => utils}/MWTimestamp.php (92%) diff --git a/autoload.php b/autoload.php index a22dc8ce36a..c703e2f4762 100644 --- a/autoload.php +++ b/autoload.php @@ -823,7 +823,7 @@ $wgAutoloadLocalClasses = [ 'MWRestrictions' => __DIR__ . '/includes/utils/MWRestrictions.php', 'MWSaltedPassword' => __DIR__ . '/includes/password/MWSaltedPassword.php', 'MWTidy' => __DIR__ . '/includes/parser/MWTidy.php', - 'MWTimestamp' => __DIR__ . '/includes/MWTimestamp.php', + 'MWTimestamp' => __DIR__ . '/includes/utils/MWTimestamp.php', 'MWUnknownContentModelException' => __DIR__ . '/includes/exception/MWUnknownContentModelException.php', 'MachineReadableRCFeedFormatter' => __DIR__ . '/includes/rcfeed/MachineReadableRCFeedFormatter.php', 'MagicWord' => __DIR__ . '/includes/parser/MagicWord.php', @@ -2164,6 +2164,7 @@ $wgAutoloadLocalClasses = [ 'MediaWiki\\User\\UserRigorOptions' => __DIR__ . '/includes/user/UserRigorOptions.php', 'MediaWiki\\User\\UserSelectQueryBuilder' => __DIR__ . '/includes/user/UserSelectQueryBuilder.php', 'MediaWiki\\User\\UserTimeCorrection' => __DIR__ . '/includes/user/UserTimeCorrection.php', + 'MediaWiki\\Utils\\MWTimestamp' => __DIR__ . '/includes/utils/MWTimestamp.php', 'MediaWiki\\Utils\\UrlUtils' => __DIR__ . '/includes/utils/UrlUtils.php', 'MediaWiki\\Watchlist\\WatchlistManager' => __DIR__ . '/includes/watchlist/WatchlistManager.php', 'MediaWiki\\Widget\\CheckMatrixWidget' => __DIR__ . '/includes/widget/CheckMatrixWidget.php', diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index bde4ddabe74..cdeb27db185 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -28,6 +28,7 @@ use MediaWiki\ResourceLoader\ResourceLoader; use MediaWiki\Shell\Shell; use MediaWiki\StubObject\StubUserLang; use MediaWiki\Title\Title; +use MediaWiki\Utils\MWTimestamp; use MediaWiki\Utils\UrlUtils; use Wikimedia\AtEase\AtEase; use Wikimedia\ParamValidator\TypeDef\ExpiryDef; diff --git a/includes/Hook/GetRelativeTimestampHook.php b/includes/Hook/GetRelativeTimestampHook.php index 86c66b24803..cfa4da70c36 100644 --- a/includes/Hook/GetRelativeTimestampHook.php +++ b/includes/Hook/GetRelativeTimestampHook.php @@ -4,7 +4,7 @@ namespace MediaWiki\Hook; use DateInterval; use Language; -use MWTimestamp; +use MediaWiki\Utils\MWTimestamp; use User; /** diff --git a/includes/OutputPage.php b/includes/OutputPage.php index fe2f5afbfaf..79385b6cbce 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -35,6 +35,7 @@ use MediaWiki\ResourceLoader as RL; use MediaWiki\ResourceLoader\ResourceLoader; use MediaWiki\Session\SessionManager; use MediaWiki\Title\Title; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\AtEase\AtEase; use Wikimedia\LightweightObjectStore\ExpirationAwareness; use Wikimedia\Parsoid\Core\TOCData; diff --git a/includes/Rest/Handler/UpdateHandler.php b/includes/Rest/Handler/UpdateHandler.php index b425000fd5d..c962afdddb3 100644 --- a/includes/Rest/Handler/UpdateHandler.php +++ b/includes/Rest/Handler/UpdateHandler.php @@ -9,7 +9,7 @@ use MediaWiki\Rest\LocalizedHttpException; use MediaWiki\Rest\Validator\JsonBodyValidator; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; -use MWTimestamp; +use MediaWiki\Utils\MWTimestamp; use TextContent; use Wikimedia\Message\MessageValue; use Wikimedia\ParamValidator\ParamValidator; diff --git a/includes/Revision/MutableRevisionRecord.php b/includes/Revision/MutableRevisionRecord.php index 0dbe4232a95..eb86d3565b8 100644 --- a/includes/Revision/MutableRevisionRecord.php +++ b/includes/Revision/MutableRevisionRecord.php @@ -28,7 +28,7 @@ use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Page\PageIdentity; use MediaWiki\Storage\RevisionSlotsUpdate; use MediaWiki\User\UserIdentity; -use MWTimestamp; +use MediaWiki\Utils\MWTimestamp; /** * Mutable RevisionRecord implementation, for building new revision entries programmatically. diff --git a/includes/Revision/RevisionArchiveRecord.php b/includes/Revision/RevisionArchiveRecord.php index 7ed1378c6ed..909d94a7383 100644 --- a/includes/Revision/RevisionArchiveRecord.php +++ b/includes/Revision/RevisionArchiveRecord.php @@ -26,7 +26,7 @@ use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Page\PageIdentity; use MediaWiki\Permissions\Authority; use MediaWiki\User\UserIdentity; -use MWTimestamp; +use MediaWiki\Utils\MWTimestamp; use stdClass; use Wikimedia\Assert\Assert; diff --git a/includes/Revision/RevisionStore.php b/includes/Revision/RevisionStore.php index b2f066264b1..ad641ea70f1 100644 --- a/includes/Revision/RevisionStore.php +++ b/includes/Revision/RevisionStore.php @@ -56,8 +56,8 @@ use MediaWiki\Title\TitleFactory; use MediaWiki\User\ActorMigration; use MediaWiki\User\ActorStore; use MediaWiki\User\UserIdentity; +use MediaWiki\Utils\MWTimestamp; use MWException; -use MWTimestamp; use MWUnknownContentModelException; use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerInterface; diff --git a/includes/Revision/RevisionStoreRecord.php b/includes/Revision/RevisionStoreRecord.php index e273bf1907e..f21df1e262e 100644 --- a/includes/Revision/RevisionStoreRecord.php +++ b/includes/Revision/RevisionStoreRecord.php @@ -27,7 +27,7 @@ use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\Page\PageIdentity; use MediaWiki\Permissions\Authority; use MediaWiki\User\UserIdentity; -use MWTimestamp; +use MediaWiki\Utils\MWTimestamp; /** * A RevisionRecord representing an existing revision persisted in the revision table. diff --git a/includes/Storage/DerivedPageDataUpdater.php b/includes/Storage/DerivedPageDataUpdater.php index a6f76024f93..a8aa749f069 100644 --- a/includes/Storage/DerivedPageDataUpdater.php +++ b/includes/Storage/DerivedPageDataUpdater.php @@ -54,8 +54,8 @@ use MediaWiki\Title\Title; use MediaWiki\User\TalkPageNotificationManager; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserNameUtils; +use MediaWiki\Utils\MWTimestamp; use MessageCache; -use MWTimestamp; use MWUnknownContentModelException; use ParserCache; use ParserOptions; diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php index 5996052c1d0..f33aa53373b 100644 --- a/includes/actions/HistoryAction.php +++ b/includes/actions/HistoryAction.php @@ -28,6 +28,7 @@ use MediaWiki\Feed\RSSFeed; use MediaWiki\Html\Html; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Rdbms\FakeResultWrapper; use Wikimedia\Rdbms\IResultWrapper; diff --git a/includes/actions/RevertAction.php b/includes/actions/RevertAction.php index 3b1b871f3d3..b59b2ae1311 100644 --- a/includes/actions/RevertAction.php +++ b/includes/actions/RevertAction.php @@ -24,6 +24,7 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Utils\MWTimestamp; /** * File reversion user interface diff --git a/includes/api/ApiBlockInfoTrait.php b/includes/api/ApiBlockInfoTrait.php index a18b6bf7994..5c6bbe83653 100644 --- a/includes/api/ApiBlockInfoTrait.php +++ b/includes/api/ApiBlockInfoTrait.php @@ -22,6 +22,7 @@ use MediaWiki\Block\AbstractBlock; use MediaWiki\Block\Block; use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\SystemBlock; +use MediaWiki\Utils\MWTimestamp; /** * @ingroup API diff --git a/includes/api/ApiCheckToken.php b/includes/api/ApiCheckToken.php index 4a40eac0e6a..ae1a42143d1 100644 --- a/includes/api/ApiCheckToken.php +++ b/includes/api/ApiCheckToken.php @@ -21,6 +21,7 @@ */ use MediaWiki\Session\Token; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\ParamValidator\ParamValidator; /** diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index d8ffee49126..93bdafaa3f9 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -35,6 +35,7 @@ use MediaWiki\Rest\HeaderParser\Origin; use MediaWiki\Session\SessionManager; use MediaWiki\StubObject\StubGlobalUser; use MediaWiki\User\UserRigorOptions; +use MediaWiki\Utils\MWTimestamp; use MediaWiki\WikiMap\WikiMap; use Wikimedia\AtEase\AtEase; use Wikimedia\ParamValidator\ParamValidator; diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php index 5caff5b6fcc..0263abcc6cd 100644 --- a/includes/api/ApiQueryUserInfo.php +++ b/includes/api/ApiQueryUserInfo.php @@ -28,6 +28,7 @@ use MediaWiki\User\UserEditTracker; use MediaWiki\User\UserGroupManager; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserOptionsLookup; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\ParamValidator\ParamValidator; /** diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php index aab3ca89674..8e3fa1c6e42 100644 --- a/includes/changes/RecentChange.php +++ b/includes/changes/RecentChange.php @@ -33,6 +33,7 @@ use MediaWiki\Storage\EditResult; use MediaWiki\Title\Title; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Assert\Assert; use Wikimedia\AtEase\AtEase; use Wikimedia\IPUtils; diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php index 06afe27c267..bd34a135040 100644 --- a/includes/filerepo/FileRepo.php +++ b/includes/filerepo/FileRepo.php @@ -14,6 +14,7 @@ use MediaWiki\Page\PageIdentity; use MediaWiki\Permissions\Authority; use MediaWiki\Title\Title; use MediaWiki\User\UserIdentity; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\AtEase\AtEase; /** diff --git a/includes/htmlform/fields/HTMLTimezoneField.php b/includes/htmlform/fields/HTMLTimezoneField.php index f69edc0d27f..78bfb3aef18 100644 --- a/includes/htmlform/fields/HTMLTimezoneField.php +++ b/includes/htmlform/fields/HTMLTimezoneField.php @@ -3,6 +3,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\User\UserTimeCorrection; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Message\ITextFormatter; use Wikimedia\Message\MessageValue; diff --git a/includes/language/Hook/GetHumanTimestampHook.php b/includes/language/Hook/GetHumanTimestampHook.php index 06db6138eff..0bdb986c574 100644 --- a/includes/language/Hook/GetHumanTimestampHook.php +++ b/includes/language/Hook/GetHumanTimestampHook.php @@ -3,7 +3,7 @@ namespace MediaWiki\Hook; use Language; -use MWTimestamp; +use MediaWiki\Utils\MWTimestamp; use User; /** diff --git a/includes/language/Language.php b/includes/language/Language.php index a638931f878..f8139057aaf 100644 --- a/includes/language/Language.php +++ b/includes/language/Language.php @@ -42,6 +42,7 @@ use MediaWiki\Parser\MagicWord; use MediaWiki\Specials\SpecialBlock; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserTimeCorrection; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Assert\Assert; use Wikimedia\AtEase\AtEase; use Wikimedia\Bcp47Code\Bcp47Code; diff --git a/includes/libs/filebackend/SwiftFileBackend.php b/includes/libs/filebackend/SwiftFileBackend.php index 1e5a8160608..467e56d270f 100644 --- a/includes/libs/filebackend/SwiftFileBackend.php +++ b/includes/libs/filebackend/SwiftFileBackend.php @@ -22,6 +22,7 @@ * @author Russ Nelson */ +use MediaWiki\Utils\MWTimestamp; use Psr\Log\LoggerInterface; use Wikimedia\AtEase\AtEase; use Wikimedia\RequestTimeout\TimeoutException; diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php index f3df0d15c25..9312473498f 100644 --- a/includes/mail/UserMailer.php +++ b/includes/mail/UserMailer.php @@ -28,6 +28,7 @@ use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Utils\MWTimestamp; use MediaWiki\WikiMap\WikiMap; /** diff --git a/includes/page/MergeHistory.php b/includes/page/MergeHistory.php index eb3bd456ddf..fc7d426398a 100644 --- a/includes/page/MergeHistory.php +++ b/includes/page/MergeHistory.php @@ -39,8 +39,8 @@ use MediaWiki\Revision\RevisionStore; use MediaWiki\Revision\SlotRecord; use MediaWiki\Title\TitleFactory; use MediaWiki\User\UserIdentity; +use MediaWiki\Utils\MWTimestamp; use Message; -use MWTimestamp; use Status; use TitleFormatter; use WatchedItemStoreInterface; diff --git a/includes/page/PageStoreRecord.php b/includes/page/PageStoreRecord.php index 0775f20f92b..1d1bcda8385 100644 --- a/includes/page/PageStoreRecord.php +++ b/includes/page/PageStoreRecord.php @@ -20,7 +20,7 @@ namespace MediaWiki\Page; -use MWTimestamp; +use MediaWiki\Utils\MWTimestamp; use stdClass; use Wikimedia\Assert\Assert; diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 4e548e63878..501242e28c5 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -51,6 +51,7 @@ use MediaWiki\Title\TitleArray; use MediaWiki\User\ActorMigration; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; +use MediaWiki\Utils\MWTimestamp; use MediaWiki\WikiMap\WikiMap; use Wikimedia\Assert\Assert; use Wikimedia\Assert\PreconditionException; diff --git a/includes/pager/RangeChronologicalPager.php b/includes/pager/RangeChronologicalPager.php index 3d08e59493d..84f9f573c29 100644 --- a/includes/pager/RangeChronologicalPager.php +++ b/includes/pager/RangeChronologicalPager.php @@ -17,6 +17,8 @@ * * @file */ + +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Timestamp\TimestampException; /** diff --git a/includes/pager/ReverseChronologicalPager.php b/includes/pager/ReverseChronologicalPager.php index 91ecff8accb..d4965bc161b 100644 --- a/includes/pager/ReverseChronologicalPager.php +++ b/includes/pager/ReverseChronologicalPager.php @@ -19,6 +19,7 @@ */ use MediaWiki\Html\Html; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Timestamp\TimestampException; /** diff --git a/includes/parser/CacheTime.php b/includes/parser/CacheTime.php index 178d897f1bb..75242691bbd 100644 --- a/includes/parser/CacheTime.php +++ b/includes/parser/CacheTime.php @@ -27,6 +27,7 @@ use MediaWiki\Json\JsonUnserializer; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Parser\ParserCacheMetadata; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Reflection\GhostFieldAccessTrait; /** diff --git a/includes/parser/CoreMagicVariables.php b/includes/parser/CoreMagicVariables.php index 1ab1c1c97ec..d369b4fa645 100644 --- a/includes/parser/CoreMagicVariables.php +++ b/includes/parser/CoreMagicVariables.php @@ -22,6 +22,7 @@ */ use MediaWiki\Config\ServiceOptions; use MediaWiki\MainConfigNames; +use MediaWiki\Utils\MWTimestamp; use Psr\Log\LoggerInterface; use Wikimedia\Timestamp\ConvertibleTimestamp; diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index eaeae8bb41d..1d5fe09185f 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -54,6 +54,7 @@ use MediaWiki\User\UserFactory; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserNameUtils; use MediaWiki\User\UserOptionsLookup; +use MediaWiki\Utils\MWTimestamp; use MediaWiki\Utils\UrlUtils; use Psr\Log\LoggerInterface; use Wikimedia\Bcp47Code\Bcp47CodeValue; diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php index cb82ae993e0..bd6ae0e29bb 100644 --- a/includes/parser/ParserOptions.php +++ b/includes/parser/ParserOptions.php @@ -29,6 +29,7 @@ use MediaWiki\Revision\SlotRecord; use MediaWiki\StubObject\StubObject; use MediaWiki\Title\Title; use MediaWiki\User\UserIdentity; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\ScopedCallback; /** diff --git a/includes/parser/RevisionOutputCache.php b/includes/parser/RevisionOutputCache.php index f01f2a6b05a..bdce7d2c152 100644 --- a/includes/parser/RevisionOutputCache.php +++ b/includes/parser/RevisionOutputCache.php @@ -28,7 +28,7 @@ use IBufferingStatsdDataFactory; use InvalidArgumentException; use MediaWiki\Json\JsonCodec; use MediaWiki\Revision\RevisionRecord; -use MWTimestamp; +use MediaWiki\Utils\MWTimestamp; use ParserOptions; use ParserOutput; use Psr\Log\LoggerInterface; diff --git a/includes/poolcounter/PoolWorkArticleViewCurrent.php b/includes/poolcounter/PoolWorkArticleViewCurrent.php index b39569a23c7..fd95269dbf5 100644 --- a/includes/poolcounter/PoolWorkArticleViewCurrent.php +++ b/includes/poolcounter/PoolWorkArticleViewCurrent.php @@ -23,6 +23,7 @@ use MediaWiki\Page\PageRecord; use MediaWiki\Page\WikiPageFactory; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionRenderer; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Rdbms\ILBFactory; /** diff --git a/includes/session/SessionManager.php b/includes/session/SessionManager.php index 4b5357a9fad..fbd60ac3cf0 100644 --- a/includes/session/SessionManager.php +++ b/includes/session/SessionManager.php @@ -1067,7 +1067,7 @@ class SessionManager implements SessionManagerInterface { return; } $mwuser = $session->getRequest()->getCookie( 'mwuser-sessionId' ); - $now = (int)\MWTimestamp::now( TS_UNIX ); + $now = (int)\MediaWiki\Utils\MWTimestamp::now( TS_UNIX ); // Record (and possibly log) that the IP is using the current session. // Don't touch the stored data unless we are changing the IP or re-adding an expired one. diff --git a/includes/specials/SpecialLog.php b/includes/specials/SpecialLog.php index 9039f91cb1d..3a4874cb166 100644 --- a/includes/specials/SpecialLog.php +++ b/includes/specials/SpecialLog.php @@ -37,7 +37,7 @@ use MediaWiki\MediaWikiServices; use MediaWiki\Title\Title; use MediaWiki\User\ActorNormalization; use MediaWiki\User\UserIdentityLookup; -use MWTimestamp; +use MediaWiki\Utils\MWTimestamp; use PermissionsError; use SpecialPage; use Wikimedia\IPUtils; diff --git a/includes/specials/SpecialRecentChanges.php b/includes/specials/SpecialRecentChanges.php index 64bb9a12827..be6c1765d85 100644 --- a/includes/specials/SpecialRecentChanges.php +++ b/includes/specials/SpecialRecentChanges.php @@ -27,6 +27,7 @@ use MediaWiki\Html\Html; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\User\UserOptionsLookup; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Rdbms\IDatabase; use Wikimedia\Rdbms\IReadableDatabase; use Wikimedia\Rdbms\IResultWrapper; diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index 7a77d3bbc50..8e16ef9a282 100644 --- a/includes/specials/SpecialVersion.php +++ b/includes/specials/SpecialVersion.php @@ -31,6 +31,7 @@ use MediaWiki\Linker\Linker; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\Parser\ParserOutputFlags; +use MediaWiki\Utils\MWTimestamp; use MediaWiki\Utils\UrlUtils; use Symfony\Component\Yaml\Yaml; use Wikimedia\Parsoid\Core\SectionMetadata; diff --git a/includes/specials/pagers/BlockListPager.php b/includes/specials/pagers/BlockListPager.php index 1c6ed099e23..9b10809a0d3 100644 --- a/includes/specials/pagers/BlockListPager.php +++ b/includes/specials/pagers/BlockListPager.php @@ -35,6 +35,7 @@ use MediaWiki\Linker\LinkRenderer; use MediaWiki\MainConfigNames; use MediaWiki\SpecialPage\SpecialPageFactory; use MediaWiki\User\UserIdentity; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\IPUtils; use Wikimedia\Rdbms\IConnectionProvider; use Wikimedia\Rdbms\IResultWrapper; diff --git a/includes/title/Title.php b/includes/title/Title.php index 5c21a7cec77..8dd4c3a1d97 100644 --- a/includes/title/Title.php +++ b/includes/title/Title.php @@ -53,11 +53,11 @@ use MediaWiki\Page\PageStoreRecord; use MediaWiki\Page\ProperPageIdentity; use MediaWiki\Request\PathRouter; use MediaWiki\ResourceLoader\WikiModule; +use MediaWiki\Utils\MWTimestamp; use MediaWikiTitleCodec; use Message; use MessageLocalizer; use MWException; -use MWTimestamp; use RequestContext; use RuntimeException; use Sanitizer; diff --git a/includes/user/TalkPageNotificationManager.php b/includes/user/TalkPageNotificationManager.php index 1c88c280d08..b02864e7d3e 100644 --- a/includes/user/TalkPageNotificationManager.php +++ b/includes/user/TalkPageNotificationManager.php @@ -28,7 +28,7 @@ use MediaWiki\HookContainer\HookRunner; use MediaWiki\MainConfigNames; use MediaWiki\Revision\RevisionLookup; use MediaWiki\Revision\RevisionRecord; -use MWTimestamp; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Rdbms\IConnectionProvider; use Wikimedia\Rdbms\ReadOnlyMode; diff --git a/includes/user/UserTimeCorrection.php b/includes/user/UserTimeCorrection.php index a07986dfbe6..5b0fc326527 100644 --- a/includes/user/UserTimeCorrection.php +++ b/includes/user/UserTimeCorrection.php @@ -26,7 +26,7 @@ use DateInterval; use DateTime; use DateTimeZone; use Exception; -use MWTimestamp; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\RequestTimeout\TimeoutException; /** diff --git a/includes/MWTimestamp.php b/includes/utils/MWTimestamp.php similarity index 92% rename from includes/MWTimestamp.php rename to includes/utils/MWTimestamp.php index 5d4dcfea047..dd824f22b85 100644 --- a/includes/MWTimestamp.php +++ b/includes/utils/MWTimestamp.php @@ -22,12 +22,19 @@ * @author Tyler Romeo, 2012 */ +namespace MediaWiki\Utils; + +use DateInterval; +use Language; use MediaWiki\HookContainer\HookRunner; use MediaWiki\Language\RawMessage; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserTimeCorrection; +use Message; +use RequestContext; +use User; use Wikimedia\Timestamp\ConvertibleTimestamp; /** @@ -58,9 +65,7 @@ class MWTimestamp extends ConvertibleTimestamp { * @return DateInterval Offset that was applied to the timestamp */ public function offsetForUser( UserIdentity $user ) { - $option = MediaWikiServices::getInstance() - ->getUserOptionsLookup() - ->getOption( $user, 'timecorrection' ); + $option = MediaWikiServices::getInstance()->getUserOptionsLookup()->getOption( $user, 'timecorrection' ); $value = new UserTimeCorrection( $option, @@ -102,11 +107,15 @@ class MWTimestamp extends ConvertibleTimestamp { $user = User::newFromIdentity( $user ); // For compatibility with the hook signature if ( ( new HookRunner( MediaWikiServices::getInstance()->getHookContainer() ) )->onGetRelativeTimestamp( - $ts, $diff, $this, $relativeTo, $user, $lang ) - ) { + $ts, + $diff, + $this, + $relativeTo, + $user, + $lang + ) ) { $seconds = ( ( ( $diff->days * 24 + $diff->h ) * 60 + $diff->i ) * 60 + $diff->s ); - $ts = wfMessage( 'ago', $lang->formatDuration( $seconds, $chosenIntervals ) ) - ->inLanguage( $lang )->text(); + $ts = wfMessage( 'ago', $lang->formatDuration( $seconds, $chosenIntervals ) )->inLanguage( $lang )->text(); } return $ts; @@ -146,3 +155,5 @@ class MWTimestamp extends ConvertibleTimestamp { return $timestamp; } } + +class_alias( MWTimestamp::class, 'MWTimestamp' ); diff --git a/includes/watcheditem/WatchedItem.php b/includes/watcheditem/WatchedItem.php index 4a24064fcdb..75f8222140f 100644 --- a/includes/watcheditem/WatchedItem.php +++ b/includes/watcheditem/WatchedItem.php @@ -22,6 +22,7 @@ use MediaWiki\Linker\LinkTarget; use MediaWiki\Page\PageIdentity; use MediaWiki\User\UserIdentity; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\ParamValidator\TypeDef\ExpiryDef; use Wikimedia\Timestamp\ConvertibleTimestamp; diff --git a/includes/watcheditem/WatchedItemStore.php b/includes/watcheditem/WatchedItemStore.php index 54d360afcc6..6401fcabe6f 100644 --- a/includes/watcheditem/WatchedItemStore.php +++ b/includes/watcheditem/WatchedItemStore.php @@ -8,6 +8,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\Page\PageIdentity; use MediaWiki\Revision\RevisionLookup; use MediaWiki\User\UserIdentity; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Assert\Assert; use Wikimedia\ParamValidator\TypeDef\ExpiryDef; use Wikimedia\Rdbms\IDatabase; diff --git a/includes/xml/Xml.php b/includes/xml/Xml.php index 0c2a6c29a95..6c325ad4011 100644 --- a/includes/xml/Xml.php +++ b/includes/xml/Xml.php @@ -24,6 +24,7 @@ use MediaWiki\Html\Html; use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\MainConfigNames; use MediaWiki\MediaWikiServices; +use MediaWiki\Utils\MWTimestamp; /** * Module of static functions for generating XML diff --git a/maintenance/categoryChangesAsRdf.php b/maintenance/categoryChangesAsRdf.php index 3e4c755f73b..5440b3d3462 100644 --- a/maintenance/categoryChangesAsRdf.php +++ b/maintenance/categoryChangesAsRdf.php @@ -19,6 +19,7 @@ use MediaWiki\Category\CategoriesRdf; use MediaWiki\MainConfigNames; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Purtle\RdfWriter; use Wikimedia\Purtle\TurtleRdfWriter; use Wikimedia\Rdbms\IReadableDatabase; diff --git a/maintenance/wikiBirthday.php b/maintenance/wikiBirthday.php index 9c006481e06..3b73cbb9873 100644 --- a/maintenance/wikiBirthday.php +++ b/maintenance/wikiBirthday.php @@ -25,6 +25,7 @@ */ use MediaWiki\MediaWikiServices; +use MediaWiki\Utils\MWTimestamp; require_once __DIR__ . '/Maintenance.php'; diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php index 1ea0f4de919..d85342b1ac4 100644 --- a/tests/parser/ParserTestRunner.php +++ b/tests/parser/ParserTestRunner.php @@ -41,6 +41,7 @@ use MediaWiki\Revision\SlotRecord; use MediaWiki\Title\Title; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; +use MediaWiki\Utils\MWTimestamp; use MediaWiki\WikiMap\WikiMap; use Psr\Log\NullLogger; use Wikimedia\Assert\Assert; diff --git a/tests/phpunit/includes/EditPageTest.php b/tests/phpunit/includes/EditPageTest.php index 7447582a046..4319718b25d 100644 --- a/tests/phpunit/includes/EditPageTest.php +++ b/tests/phpunit/includes/EditPageTest.php @@ -8,6 +8,7 @@ use MediaWiki\Revision\RevisionRecord; use MediaWiki\Storage\EditResult; use MediaWiki\Title\Title; use MediaWiki\User\UserIdentity; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\TestingAccessWrapper; /** diff --git a/tests/phpunit/includes/MWTimestampTest.php b/tests/phpunit/includes/MWTimestampTest.php index efeaedd5ff7..86d5f92c685 100644 --- a/tests/phpunit/includes/MWTimestampTest.php +++ b/tests/phpunit/includes/MWTimestampTest.php @@ -2,6 +2,7 @@ use MediaWiki\User\StaticUserOptionsLookup; use MediaWiki\User\UserIdentityValue; +use MediaWiki\Utils\MWTimestamp; /** * @covers MWTimestamp diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php index 91adbb6fa51..4fd6572ab2b 100644 --- a/tests/phpunit/includes/OutputPageTest.php +++ b/tests/phpunit/includes/OutputPageTest.php @@ -15,6 +15,7 @@ use MediaWiki\ResourceLoader as RL; use MediaWiki\ResourceLoader\ResourceLoader; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; use MediaWiki\Title\Title; +use MediaWiki\Utils\MWTimestamp; use PHPUnit\Framework\MockObject\MockObject; use Wikimedia\DependencyStore\KeyValueDependencyStore; use Wikimedia\LightweightObjectStore\ExpirationAwareness; diff --git a/tests/phpunit/includes/Revision/ArchivedRevisionLookupTest.php b/tests/phpunit/includes/Revision/ArchivedRevisionLookupTest.php index 730aa6a9c18..267608fa34d 100644 --- a/tests/phpunit/includes/Revision/ArchivedRevisionLookupTest.php +++ b/tests/phpunit/includes/Revision/ArchivedRevisionLookupTest.php @@ -8,8 +8,8 @@ use MediaWiki\Page\PageIdentityValue; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; +use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; -use MWTimestamp; /** * @group Database diff --git a/tests/phpunit/includes/Revision/RevisionStoreDbTest.php b/tests/phpunit/includes/Revision/RevisionStoreDbTest.php index 90ffb15626d..6de22ffd944 100644 --- a/tests/phpunit/includes/Revision/RevisionStoreDbTest.php +++ b/tests/phpunit/includes/Revision/RevisionStoreDbTest.php @@ -30,8 +30,8 @@ use MediaWiki\Tests\Unit\DummyServicesTrait; use MediaWiki\Title\Title; use MediaWiki\Title\TitleFactory; use MediaWiki\User\UserIdentityValue; +use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; -use MWTimestamp; use PHPUnit\Framework\MockObject\MockObject; use StatusValue; use TextContent; diff --git a/tests/phpunit/includes/Revision/RevisionStoreTest.php b/tests/phpunit/includes/Revision/RevisionStoreTest.php index d7d668dfdbf..189f8595a0f 100644 --- a/tests/phpunit/includes/Revision/RevisionStoreTest.php +++ b/tests/phpunit/includes/Revision/RevisionStoreTest.php @@ -7,9 +7,9 @@ use MediaWiki\Revision\IncompleteRevisionException; use MediaWiki\Revision\RevisionAccessException; use MediaWiki\Revision\RevisionStore; use MediaWiki\Revision\SlotRecord; +use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; use MWException; -use MWTimestamp; use PHPUnit\Framework\MockObject\MockObject; use Wikimedia\Rdbms\IDatabase; use Wikimedia\Rdbms\ILoadBalancer; diff --git a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php index 47298f22530..e17dec9d635 100644 --- a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php +++ b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php @@ -27,11 +27,11 @@ use MediaWiki\Storage\RevisionSlotsUpdate; use MediaWiki\Title\Title; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; +use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; use Message; use MockTitleTrait; use MWCallableUpdate; -use MWTimestamp; use ParserOptions; use PHPUnit\Framework\MockObject\MockObject; use TextContent; diff --git a/tests/phpunit/includes/TitleTest.php b/tests/phpunit/includes/TitleTest.php index f75d4e26c0d..4e3690dd0a8 100644 --- a/tests/phpunit/includes/TitleTest.php +++ b/tests/phpunit/includes/TitleTest.php @@ -7,6 +7,7 @@ use MediaWiki\Page\PageIdentity; use MediaWiki\Page\PageIdentityValue; use MediaWiki\Tests\Unit\DummyServicesTrait; use MediaWiki\Title\Title; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Assert\PreconditionException; /** diff --git a/tests/phpunit/includes/api/ApiBlockTest.php b/tests/phpunit/includes/api/ApiBlockTest.php index 822381bf75d..475b5bbb630 100644 --- a/tests/phpunit/includes/api/ApiBlockTest.php +++ b/tests/phpunit/includes/api/ApiBlockTest.php @@ -9,6 +9,7 @@ use MediaWiki\Permissions\Authority; use MediaWiki\Permissions\UltimateAuthority; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; use MediaWiki\User\UserRigorOptions; +use MediaWiki\Utils\MWTimestamp; /** * @group API diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php index e47cef81291..d1f9717ced2 100644 --- a/tests/phpunit/includes/api/ApiEditPageTest.php +++ b/tests/phpunit/includes/api/ApiEditPageTest.php @@ -4,6 +4,7 @@ use MediaWiki\Block\DatabaseBlock; use MediaWiki\MainConfigNames; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Title\Title; +use MediaWiki\Utils\MWTimestamp; /** * Tests for MediaWiki api.php?action=edit. diff --git a/tests/phpunit/includes/api/query/ApiQueryImageInfoTest.php b/tests/phpunit/includes/api/query/ApiQueryImageInfoTest.php index 95bcba8d346..3b0f78d4d2d 100644 --- a/tests/phpunit/includes/api/query/ApiQueryImageInfoTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryImageInfoTest.php @@ -2,6 +2,7 @@ use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; use MediaWiki\User\UserIdentityValue; +use MediaWiki\Utils\MWTimestamp; /** * @covers ApiQueryImageInfo diff --git a/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php b/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php index b315d3f6840..d8bcfeaf297 100644 --- a/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php @@ -1,5 +1,7 @@ overrideConfigValue( MainConfigNames::SuspiciousIpExpiry, 600 ); $manager = new SessionManager(); $logger = $this->createMock( LoggerInterface::class ); diff --git a/tests/phpunit/includes/specialpage/FormSpecialPageTestCase.php b/tests/phpunit/includes/specialpage/FormSpecialPageTestCase.php index 06db6d0820b..2e91b1384ec 100644 --- a/tests/phpunit/includes/specialpage/FormSpecialPageTestCase.php +++ b/tests/phpunit/includes/specialpage/FormSpecialPageTestCase.php @@ -3,6 +3,7 @@ use MediaWiki\Block\BlockErrorFormatter; use MediaWiki\Block\DatabaseBlock; use MediaWiki\DAO\WikiAwareEntity; +use MediaWiki\Utils\MWTimestamp; /** * Factory for handling the special page list and generating SpecialPage objects. diff --git a/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php b/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php index 3dd0a637ba2..f1523f3feca 100644 --- a/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php +++ b/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php @@ -11,6 +11,7 @@ use MediaWiki\CommentFormatter\RowCommentFormatter; use MediaWiki\Linker\LinkRenderer; use MediaWiki\MainConfigNames; use MediaWiki\SpecialPage\SpecialPageFactory; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Rdbms\FakeResultWrapper; use Wikimedia\Rdbms\ILoadBalancer; use Wikimedia\TestingAccessWrapper; diff --git a/tests/phpunit/includes/user/TalkPageNotificationManagerTest.php b/tests/phpunit/includes/user/TalkPageNotificationManagerTest.php index 14c89f7c21a..4ab76b39fc3 100644 --- a/tests/phpunit/includes/user/TalkPageNotificationManagerTest.php +++ b/tests/phpunit/includes/user/TalkPageNotificationManagerTest.php @@ -10,6 +10,7 @@ use MediaWiki\Title\Title; use MediaWiki\User\TalkPageNotificationManager; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; +use MediaWiki\Utils\MWTimestamp; use PHPUnit\Framework\AssertionFailedError; /** diff --git a/tests/phpunit/includes/user/UserGroupManagerTest.php b/tests/phpunit/includes/user/UserGroupManagerTest.php index d9505a74b82..afb547ab650 100644 --- a/tests/phpunit/includes/user/UserGroupManagerTest.php +++ b/tests/phpunit/includes/user/UserGroupManagerTest.php @@ -33,8 +33,8 @@ use MediaWiki\User\UserEditTracker; use MediaWiki\User\UserGroupManager; use MediaWiki\User\UserIdentity; use MediaWiki\User\UserIdentityValue; +use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; -use MWTimestamp; use RequestContext; use SiteConfiguration; use TestLogger; diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php index 3e98e90f204..f7bbf96644d 100644 --- a/tests/phpunit/includes/user/UserTest.php +++ b/tests/phpunit/includes/user/UserTest.php @@ -12,6 +12,7 @@ use MediaWiki\Request\FauxRequest; use MediaWiki\Tests\Unit\DummyServicesTrait; use MediaWiki\Title\Title; use MediaWiki\User\UserIdentityValue; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Assert\PreconditionException; use Wikimedia\TestingAccessWrapper; diff --git a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php index 7e1a7820699..5e2879db6a4 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/Helper/HtmlOutputRendererHelperTest.php @@ -30,8 +30,8 @@ use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionAccessException; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; +use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; -use MWTimestamp; use NullStatsdDataFactory; use ParserCache; use ParserOptions; diff --git a/tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php index ba38f163cac..606845aed3a 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/PageHTMLHandlerTest.php @@ -11,8 +11,8 @@ use MediaWiki\Rest\Handler\PageHTMLHandler; use MediaWiki\Rest\LocalizedHttpException; use MediaWiki\Rest\RequestData; use MediaWiki\Title\Title; +use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; -use MWTimestamp; use PHPUnit\Framework\MockObject\MockObject; use Psr\Http\Message\StreamInterface; use Wikimedia\Message\MessageValue; diff --git a/tests/phpunit/integration/includes/Rest/Handler/RevisionHTMLHandlerTest.php b/tests/phpunit/integration/includes/Rest/Handler/RevisionHTMLHandlerTest.php index 5e8cbf41ab9..f0ff5dfec84 100644 --- a/tests/phpunit/integration/includes/Rest/Handler/RevisionHTMLHandlerTest.php +++ b/tests/phpunit/integration/includes/Rest/Handler/RevisionHTMLHandlerTest.php @@ -18,8 +18,8 @@ use MediaWiki\Rest\Handler\RevisionHTMLHandler; use MediaWiki\Rest\LocalizedHttpException; use MediaWiki\Rest\RequestData; use MediaWiki\Revision\RevisionRecord; +use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; -use MWTimestamp; use NullStatsdDataFactory; use Psr\Http\Message\StreamInterface; use Psr\Log\NullLogger; diff --git a/tests/phpunit/maintenance/CategoryChangesAsRdfTest.php b/tests/phpunit/maintenance/CategoryChangesAsRdfTest.php index c6499bda4ae..fcd4dff39f3 100644 --- a/tests/phpunit/maintenance/CategoryChangesAsRdfTest.php +++ b/tests/phpunit/maintenance/CategoryChangesAsRdfTest.php @@ -2,6 +2,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\Title\Title; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Rdbms\IDatabase; use Wikimedia\Timestamp\ConvertibleTimestamp;