Remove hard deprecation of PasswordPolicyChecks::checkPopularPasswordBlacklist

[lhc/web/wiklou.git] / tests / phpunit / includes / TimeAdjustTest.php

diff --git a/tests/phpunit/includes/TimeAdjustTest.php b/tests/phpunit/includes/TimeAdjustTest.php
index ae82bc4..b59282d 100644 (file)
--- 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' ],
+               ];
        }
 }