Merge "Fix sessionfailure i18n message during authentication"

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

diff --git a/tests/phpunit/includes/config/GlobalVarConfigTest.php b/tests/phpunit/includes/config/GlobalVarConfigTest.php
index c76e8bb..db5f73d 100644 (file)
--- a/tests/phpunit/includes/config/GlobalVarConfigTest.php
+++ b/tests/phpunit/includes/config/GlobalVarConfigTest.php
@@ -7,7 +7,7 @@ class GlobalVarConfigTest extends MediaWikiTestCase {
         */
        public function testNewInstance() {
                $config = GlobalVarConfig::newInstance();
-               $this->assertInstanceOf( 'GlobalVarConfig', $config );
+               $this->assertInstanceOf( GlobalVarConfig::class, $config );
                $this->maybeStashGlobal( 'wgBaz' );
                $GLOBALS['wgBaz'] = 'somevalue';
                // Check prefix is set to 'wg'
@@ -24,7 +24,7 @@ class GlobalVarConfigTest extends MediaWikiTestCase {
                $this->maybeStashGlobal( $var );
                $GLOBALS[$var] = $rand;
                $config = new GlobalVarConfig( $prefix );
-               $this->assertInstanceOf( 'GlobalVarConfig', $config );
+               $this->assertInstanceOf( GlobalVarConfig::class, $config );
                $this->assertEquals( $rand, $config->get( 'GlobalVarConfigTest' ) );
        }
 
@@ -40,6 +40,7 @@ class GlobalVarConfigTest extends MediaWikiTestCase {
 
        /**
         * @covers GlobalVarConfig::has
+        * @covers GlobalVarConfig::hasWithPrefix
         */
        public function testHas() {
                $this->maybeStashGlobal( 'wgGlobalVarConfigTestHas' );
@@ -72,17 +73,17 @@ class GlobalVarConfigTest extends MediaWikiTestCase {
        }
 
        /**
-        * @param string $name
-        * @param string $prefix
-        * @param string $expected
         * @dataProvider provideGet
         * @covers GlobalVarConfig::get
         * @covers GlobalVarConfig::getWithPrefix
+        * @param string $name
+        * @param string $prefix
+        * @param string $expected
         */
        public function testGet( $name, $prefix, $expected ) {
                $config = new GlobalVarConfig( $prefix );
                if ( $expected === false ) {
-                       $this->setExpectedException( 'ConfigException', 'GlobalVarConfig::get: undefined option:' );
+                       $this->setExpectedException( ConfigException::class, 'GlobalVarConfig::get: undefined option:' );
                }
                $this->assertEquals( $config->get( $name ), $expected );
        }