X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FTimeAdjustTest.php;h=b59282dd798007e32fd5ba4523c1b76c9e007e60;hb=f57c8f9da04b42361beb1d396f5d0f614a4895bb;hp=ae82bc4079eee30b116d4f91b264a7d2f847717d;hpb=ca28853e225fb8c3a2715c6f5bcc558d9e482590;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/TimeAdjustTest.php b/tests/phpunit/includes/TimeAdjustTest.php
index ae82bc4079..b59282dd79 100644
--- a/tests/phpunit/includes/TimeAdjustTest.php
+++ b/tests/phpunit/includes/TimeAdjustTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\MediaWikiServices;
+
 class TimeAdjustTest extends MediaWikiLangTestCase {
 	protected function setUp() {
 		parent::setUp();
@@ -11,29 +13,28 @@ class TimeAdjustTest extends MediaWikiLangTestCase {
 	 * @covers Language::userAdjust
 	 */
 	public function testUserAdjust( $date, $localTZoffset, $expected ) {
-		global $wgContLang;
-
 		$this->setMwGlobals( 'wgLocalTZoffset', $localTZoffset );
 
 		$this->assertEquals(
 			$expected,
-			strval( $wgContLang->userAdjust( $date, '' ) ),
+			strval( MediaWikiServices::getInstance()->getContentLanguage()->
+				userAdjust( $date, '' ) ),
 			"User adjust {$date} by {$localTZoffset} minutes should give {$expected}"
 		);
 	}
 
 	public static function dataUserAdjust() {
-		return array(
-			array( '20061231235959', 0, '20061231235959' ),
-			array( '20061231235959', 5, '20070101000459' ),
-			array( '20061231235959', 15, '20070101001459' ),
-			array( '20061231235959', 60, '20070101005959' ),
-			array( '20061231235959', 90, '20070101012959' ),
-			array( '20061231235959', 120, '20070101015959' ),
-			array( '20061231235959', 540, '20070101085959' ),
-			array( '20061231235959', -5, '20061231235459' ),
-			array( '20061231235959', -30, '20061231232959' ),
-			array( '20061231235959', -60, '20061231225959' ),
-		);
+		return [
+			[ '20061231235959', 0, '20061231235959' ],
+			[ '20061231235959', 5, '20070101000459' ],
+			[ '20061231235959', 15, '20070101001459' ],
+			[ '20061231235959', 60, '20070101005959' ],
+			[ '20061231235959', 90, '20070101012959' ],
+			[ '20061231235959', 120, '20070101015959' ],
+			[ '20061231235959', 540, '20070101085959' ],
+			[ '20061231235959', -5, '20061231235459' ],
+			[ '20061231235959', -30, '20061231232959' ],
+			[ '20061231235959', -60, '20061231225959' ],
+		];
 	}
 }