diff options
83 files changed, 103 insertions, 37 deletions
diff --git a/autoload.php b/autoload.php index a22dc8ce36a8..c703e2f4762a 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 bde4ddabe74d..cdeb27db185a 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 86c66b248034..cfa4da70c360 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 fe2f5afbfaf7..79385b6cbcea 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 b425000fd5dd..c962afdddb3b 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 0dbe4232a95f..eb86d3565b85 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 7ed1378c6ed7..909d94a73830 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 b2f066264b18..ad641ea70f1f 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 e273bf1907ef..f21df1e262eb 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 a6f76024f93c..a8aa749f0692 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 5996052c1d00..f33aa53373be 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 3b1b871f3d35..b59b2ae13116 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 a18b6bf7994f..5c6bbe83653b 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 4a40eac0e6af..ae1a42143d14 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 d8ffee49126c..93bdafaa3f97 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 5caff5b6fccb..0263abcc6cd6 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 aab3ca89674f..8e3fa1c6e429 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 06afe27c267a..bd34a1350409 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 f69edc0d27f6..78bfb3aef186 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 06db6138effc..0bdb986c574b 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 a638931f878d..f8139057aafc 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 1e5a81606081..467e56d270f4 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 f3df0d15c252..9312473498fd 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 eb3bd456ddf6..fc7d426398ab 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 0775f20f92b8..1d1bcda83855 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 4e548e638780..501242e28c56 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 3d08e59493d6..84f9f573c297 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 91ecff8accb6..d4965bc161b7 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 178d897f1bb0..75242691bbd1 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 1ab1c1c97eca..d369b4fa6451 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 eaeae8bb41d3..1d5fe09185f2 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 cb82ae993e05..bd6ae0e29bbb 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 f01f2a6b05aa..bdce7d2c1529 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 b39569a23c7d..fd95269dbf58 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 4b5357a9fad1..fbd60ac3cf00 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 9039f91cb1db..3a4874cb1662 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 64bb9a128272..be6c1765d854 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 7a77d3bbc50e..8e16ef9a282a 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 1c6ed099e23d..9b10809a0d30 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 5c21a7cec77f..8dd4c3a1d97e 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 1c88c280d08a..b02864e7d3e5 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 a07986dfbe63..5b0fc3265279 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 index 5d4dcfea0478..dd824f22b85f 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 4a24064fcdb7..75f8222140f1 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 54d360afcc69..6401fcabe6f4 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 0c2a6c29a950..6c325ad40116 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 3e4c755f73bf..5440b3d34629 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 9c006481e061..3b73cbb98739 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 1ea0f4de919c..d85342b1ac4f 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 7447582a0469..4319718b25dc 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 efeaedd5ff79..86d5f92c685c 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 91adbb6fa518..4fd6572ab2bf 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 730aa6a9c183..267608fa34da 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 90ffb15626d1..6de22ffd944e 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 d7d668dfdbf7..189f8595a0f3 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 47298f225305..e17dec9d635c 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 f75d4e26c0db..4e3690dd0a8e 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 822381bf75d6..475b5bbb6308 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 e47cef812911..d1f9717ced22 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 95bcba8d3460..3b0f78d4d2d6 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 b315d3f6840a..d8bcfeaf297a 100644 --- a/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php @@ -1,5 +1,7 @@ <?php +use MediaWiki\Utils\MWTimestamp; + /** * @group API * @group Database diff --git a/tests/phpunit/includes/changes/EnhancedChangesListTest.php b/tests/phpunit/includes/changes/EnhancedChangesListTest.php index c70e0d92cc25..74c456dc744f 100644 --- a/tests/phpunit/includes/changes/EnhancedChangesListTest.php +++ b/tests/phpunit/includes/changes/EnhancedChangesListTest.php @@ -1,6 +1,7 @@ <?php use MediaWiki\Title\Title; +use MediaWiki\Utils\MWTimestamp; /** * @covers EnhancedChangesList diff --git a/tests/phpunit/includes/changes/RecentChangeTest.php b/tests/phpunit/includes/changes/RecentChangeTest.php index 49354e2ab8b5..30afafe70343 100644 --- a/tests/phpunit/includes/changes/RecentChangeTest.php +++ b/tests/phpunit/includes/changes/RecentChangeTest.php @@ -10,6 +10,7 @@ use MediaWiki\Permissions\PermissionStatus; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; use MediaWiki\Title\Title; use MediaWiki\User\UserIdentityValue; +use MediaWiki\Utils\MWTimestamp; /** * @group Database diff --git a/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php b/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php index 3eaa5111800b..9da80aab41be 100644 --- a/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php +++ b/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php @@ -3,6 +3,7 @@ use MediaWiki\MainConfigNames; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Title\Title; +use MediaWiki\Utils\MWTimestamp; /** * @covers CategoryMembershipChangeJob diff --git a/tests/phpunit/includes/page/ArticleViewTest.php b/tests/phpunit/includes/page/ArticleViewTest.php index 11cbf62413fc..d4fb877de9ba 100644 --- a/tests/phpunit/includes/page/ArticleViewTest.php +++ b/tests/phpunit/includes/page/ArticleViewTest.php @@ -6,6 +6,7 @@ use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; use MediaWiki\Title\Title; +use MediaWiki\Utils\MWTimestamp; use PHPUnit\Framework\MockObject\MockObject; use Wikimedia\TestingAccessWrapper; diff --git a/tests/phpunit/includes/page/ParserOutputAccessTest.php b/tests/phpunit/includes/page/ParserOutputAccessTest.php index 50e1233d24ec..0643e6d77767 100644 --- a/tests/phpunit/includes/page/ParserOutputAccessTest.php +++ b/tests/phpunit/includes/page/ParserOutputAccessTest.php @@ -12,6 +12,7 @@ use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionRenderer; use MediaWiki\Revision\RevisionStore; use MediaWiki\Revision\SlotRecord; +use MediaWiki\Utils\MWTimestamp; use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; diff --git a/tests/phpunit/includes/page/WikiPageDbTest.php b/tests/phpunit/includes/page/WikiPageDbTest.php index 6340cc60ef42..cccce8cb8d89 100644 --- a/tests/phpunit/includes/page/WikiPageDbTest.php +++ b/tests/phpunit/includes/page/WikiPageDbTest.php @@ -13,6 +13,7 @@ use MediaWiki\Storage\RevisionSlotsUpdate; use MediaWiki\Tests\Unit\DummyServicesTrait; use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait; use MediaWiki\Title\Title; +use MediaWiki\Utils\MWTimestamp; use PHPUnit\Framework\Assert; use PHPUnit\Framework\MockObject\MockObject; use Wikimedia\TestingAccessWrapper; diff --git a/tests/phpunit/includes/pager/ReverseChronologicalPagerTest.php b/tests/phpunit/includes/pager/ReverseChronologicalPagerTest.php index ec4fc8440576..38057d107bbc 100644 --- a/tests/phpunit/includes/pager/ReverseChronologicalPagerTest.php +++ b/tests/phpunit/includes/pager/ReverseChronologicalPagerTest.php @@ -1,5 +1,6 @@ <?php +use MediaWiki\Utils\MWTimestamp; use Wikimedia\TestingAccessWrapper; /** diff --git a/tests/phpunit/includes/parser/CacheTimeTest.php b/tests/phpunit/includes/parser/CacheTimeTest.php index f4b29b20037d..af87ff326962 100644 --- a/tests/phpunit/includes/parser/CacheTimeTest.php +++ b/tests/phpunit/includes/parser/CacheTimeTest.php @@ -4,8 +4,8 @@ namespace MediaWiki\Tests\Parser; use CacheTime; use MediaWiki\MainConfigNames; +use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; -use MWTimestamp; use ParserOptions; use Wikimedia\Tests\SerializationTestTrait; diff --git a/tests/phpunit/includes/parser/ParserCacheSerializationTestCases.php b/tests/phpunit/includes/parser/ParserCacheSerializationTestCases.php index 1a11c3f2a55c..ee9fd9cab9dc 100644 --- a/tests/phpunit/includes/parser/ParserCacheSerializationTestCases.php +++ b/tests/phpunit/includes/parser/ParserCacheSerializationTestCases.php @@ -6,9 +6,9 @@ use CacheTime; use JsonSerializable; use MediaWiki\Json\JsonCodec; use MediaWiki\Title\Title; +use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; use MWDebug; -use MWTimestamp; use ParserOutput; use Wikimedia\TestingAccessWrapper; use Wikimedia\Tests\SerializationTestUtils; diff --git a/tests/phpunit/includes/parser/ParserCacheTest.php b/tests/phpunit/includes/parser/ParserCacheTest.php index 3b0ddd917f44..2bdea41173af 100644 --- a/tests/phpunit/includes/parser/ParserCacheTest.php +++ b/tests/phpunit/includes/parser/ParserCacheTest.php @@ -15,8 +15,8 @@ use MediaWiki\Page\WikiPageFactory; use MediaWiki\Tests\Json\JsonUnserializableSuperClass; use MediaWiki\Title\Title; use MediaWiki\Title\TitleFactory; +use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; -use MWTimestamp; use NullStatsdDataFactory; use ParserCache; use ParserOptions; diff --git a/tests/phpunit/includes/parser/ParserOutputTest.php b/tests/phpunit/includes/parser/ParserOutputTest.php index e44de74a7fa5..317a35be3db1 100644 --- a/tests/phpunit/includes/parser/ParserOutputTest.php +++ b/tests/phpunit/includes/parser/ParserOutputTest.php @@ -5,6 +5,7 @@ use MediaWiki\Page\PageReferenceValue; use MediaWiki\Parser\ParserOutputStringSets; use MediaWiki\Tests\Parser\ParserCacheSerializationTestCases; use MediaWiki\Title\Title; +use MediaWiki\Utils\MWTimestamp; use Wikimedia\Bcp47Code\Bcp47CodeValue; use Wikimedia\Parsoid\Core\SectionMetadata; use Wikimedia\Parsoid\Core\TOCData; diff --git a/tests/phpunit/includes/parser/RevisionOutputCacheTest.php b/tests/phpunit/includes/parser/RevisionOutputCacheTest.php index 04e7677ed433..e94191e4d0ed 100644 --- a/tests/phpunit/includes/parser/RevisionOutputCacheTest.php +++ b/tests/phpunit/includes/parser/RevisionOutputCacheTest.php @@ -12,8 +12,8 @@ use MediaWiki\Parser\RevisionOutputCache; use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Tests\Json\JsonUnserializableSuperClass; +use MediaWiki\Utils\MWTimestamp; use MediaWikiIntegrationTestCase; -use MWTimestamp; use NullStatsdDataFactory; use ParserOptions; use ParserOutput; diff --git a/tests/phpunit/includes/session/SessionManagerTest.php b/tests/phpunit/includes/session/SessionManagerTest.php index 3170c9eb37ac..a72d7e6f3fc6 100644 --- a/tests/phpunit/includes/session/SessionManagerTest.php +++ b/tests/phpunit/includes/session/SessionManagerTest.php @@ -1535,7 +1535,7 @@ class SessionManagerTest extends MediaWikiIntegrationTestCase { public function testLogPotentialSessionLeakage( $ip, $mwuser, $sessionData, $expectedSessionData, $expectedLogLevel ) { - \MWTimestamp::setFakeTime( 1234567 ); + \MediaWiki\Utils\MWTimestamp::setFakeTime( 1234567 ); $this->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 06db6d0820ba..2e91b1384ec5 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 3dd0a637ba2f..f1523f3feca3 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 14c89f7c21a8..4ab76b39fc38 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 d9505a74b824..afb547ab650f 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 3e98e90f2043..f7bbf96644d9 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 7e1a78206990..5e2879db6a40 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 ba38f163cacc..606845aed3ab 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 5e8cbf41ab9b..f0ff5dfec84a 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 c6499bda4ae9..fcd4dff39f3c 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; |