Merge "Add checkDependencies.php"

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

diff --git a/tests/phpunit/includes/user/LocalIdLookupTest.php b/tests/phpunit/includes/user/LocalIdLookupTest.php
index c91d8e0..9f45c02 100644 (file)
--- a/tests/phpunit/includes/user/LocalIdLookupTest.php
+++ b/tests/phpunit/includes/user/LocalIdLookupTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Block\DatabaseBlock;
+
 /**
  * @covers LocalIdLookup
  * @group Database
@@ -8,12 +10,10 @@ class LocalIdLookupTest extends MediaWikiTestCase {
        private $localUsers = [];
 
        protected function setUp() {
-               global $wgGroupPermissions;
-
                parent::setUp();
 
-               $this->stashMwGlobals( [ 'wgGroupPermissions' ] );
-               $wgGroupPermissions['local-id-lookup-test']['hideuser'] = true;
+               $this->setGroupPermissions( 'local-id-lookup-test', 'hideuser', true );
+               $this->overrideMwServices();
        }
 
        public function addDBData() {
@@ -23,7 +23,7 @@ class LocalIdLookupTest extends MediaWikiTestCase {
 
                $sysop = static::getTestSysop()->getUser();
 
-               $block = new Block( [
+               $block = new DatabaseBlock( [
                        'address' => $this->localUsers[2]->getName(),
                        'by' => $sysop->getId(),
                        'reason' => __METHOD__,
@@ -32,7 +32,7 @@ class LocalIdLookupTest extends MediaWikiTestCase {
                ] );
                $block->insert();
 
-               $block = new Block( [
+               $block = new DatabaseBlock( [
                        'address' => $this->localUsers[3]->getName(),
                        'by' => $sysop->getId(),
                        'reason' => __METHOD__,
@@ -127,9 +127,8 @@ class LocalIdLookupTest extends MediaWikiTestCase {
         * @param bool $localDBSet $wgLocalDatabases contains the shared DB
         */
        public function testIsAttachedShared( $sharedDB, $sharedTable, $localDBSet ) {
-               global $wgDBName;
                $this->setMwGlobals( [
-                       'wgSharedDB' => $sharedDB ? $wgDBName : null,
+                       'wgSharedDB' => $sharedDB ? "dummy" : null,
                        'wgSharedTables' => $sharedTable ? [ 'user' ] : [],
                        'wgLocalDatabases' => $localDBSet ? [ 'shared' ] : [],
                ] );