Merge "Type hint against LinkTarget in WatchedItemStore"

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

diff --git a/tests/phpunit/includes/RevisionDbTestBase.php b/tests/phpunit/includes/RevisionDbTestBase.php
index 7501167..83e8d85 100644 (file)
--- a/tests/phpunit/includes/RevisionDbTestBase.php
+++ b/tests/phpunit/includes/RevisionDbTestBase.php
@@ -1,4 +1,5 @@
 <?php
+
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionStore;
@@ -1467,7 +1468,7 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase {
                        $rev->getPage(),
                        $rev->getId()
                );
-               $cache->delete( $key, WANObjectCache::HOLDOFF_NONE );
+               $cache->delete( $key, WANObjectCache::HOLDOFF_TTL_NONE );
                $this->assertFalse( $cache->get( $key ) );
 
                ++$now;
@@ -1538,8 +1539,7 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase {
        public function testUserCanBitfield( $bitField, $field, $userGroups, $title, $expected ) {
                $title = Title::newFromText( $title );
 
-               $this->setMwGlobals(
-                       'wgGroupPermissions',
+               $this->setGroupPermissions(
                        [
                                'sysop' => [
                                        'deletedtext' => true,
@@ -1591,8 +1591,7 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase {
         * @covers Revision::userCan
         */
        public function testUserCan( $bitField, $field, $userGroups, $expected ) {
-               $this->setMwGlobals(
-                       'wgGroupPermissions',
+               $this->setGroupPermissions(
                        [
                                'sysop' => [
                                        'deletedtext' => true,