Reorg: Move MWTimestamp to MediaWiki\Utils

Bug: T321882
Change-Id: I48c10343295c4eb3d9ef8037343b0070e928f040

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',

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;

includes/Hook/GetRelativeTimestampHook.php

@@ -4,7 +4,7 @@ namespace MediaWiki\Hook;
 
 use DateInterval;
 use Language;
-use MWTimestamp;
+use MediaWiki\Utils\MWTimestamp;
 use User;
 
 /**

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;

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;

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.

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;
 

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;

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.

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;

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;
 

includes/actions/RevertAction.php

@@ -24,6 +24,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Utils\MWTimestamp;
 
 /**
  * File reversion user interface

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

includes/api/ApiCheckToken.php

@@ -21,6 +21,7 @@
  */
 
 use MediaWiki\Session\Token;
+use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\ParamValidator\ParamValidator;
 
 /**

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;

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;
 
 /**

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;

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;
 
 /**

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;
 

includes/language/Hook/GetHumanTimestampHook.php

@@ -3,7 +3,7 @@
 namespace MediaWiki\Hook;
 
 use Language;
-use MWTimestamp;
+use MediaWiki\Utils\MWTimestamp;
 use User;
 
 /**

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;

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;

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;
 
 /**

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;

includes/page/PageStoreRecord.php

@@ -20,7 +20,7 @@
 
 namespace MediaWiki\Page;
 
-use MWTimestamp;
+use MediaWiki\Utils\MWTimestamp;
 use stdClass;
 use Wikimedia\Assert\Assert;
 

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;

includes/pager/RangeChronologicalPager.php

@@ -17,6 +17,8 @@
  *
  * @file
  */
+
+use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\Timestamp\TimestampException;
 
 /**

includes/pager/ReverseChronologicalPager.php

@@ -19,6 +19,7 @@
  */
 
 use MediaWiki\Html\Html;
+use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\Timestamp\TimestampException;
 
 /**

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;
 
 /**

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;
 

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;

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;
 
 /**

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;

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;
 
 /**

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.

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;

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;

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;

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;

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;

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;
 

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;
 
 /**

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' );

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;
 

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;

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

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;

maintenance/wikiBirthday.php

@@ -25,6 +25,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Utils\MWTimestamp;
 
 require_once __DIR__ . '/Maintenance.php';
 

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;

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;
 
 /**

tests/phpunit/includes/MWTimestampTest.php

@@ -2,6 +2,7 @@
 
 use MediaWiki\User\StaticUserOptionsLookup;
 use MediaWiki\User\UserIdentityValue;
+use MediaWiki\Utils\MWTimestamp;
 
 /**
  * @covers MWTimestamp

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;

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

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;

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;

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;

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;
 
 /**

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

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.

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

tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Utils\MWTimestamp;
+
 /**
  * @group API
  * @group Database

tests/phpunit/includes/changes/EnhancedChangesListTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Title\Title;
+use MediaWiki\Utils\MWTimestamp;
 
 /**
  * @covers EnhancedChangesList

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

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

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;
 

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;

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;

tests/phpunit/includes/pager/ReverseChronologicalPagerTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\TestingAccessWrapper;
 
 /**

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;
 

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;

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;

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;

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;

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 );

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.

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;

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;
 
 /**

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;

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;
 

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;

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;

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;

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;