Merge "Use HTTPS instead of HTTP for interwiki"

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

diff --git a/tests/phpunit/includes/context/RequestContextTest.php b/tests/phpunit/includes/context/RequestContextTest.php
index e0487c2..32e71e0 100644 (file)
--- a/tests/phpunit/includes/context/RequestContextTest.php
+++ b/tests/phpunit/includes/context/RequestContextTest.php
@@ -56,19 +56,19 @@ class RequestContextTest extends MediaWikiTestCase {
                $user = User::newFromName( 'UnitTestContextUser' );
                $user->addToDatabase();
 
-               $sinfo = array(
+               $sinfo = [
                        'sessionId' => 'd612ee607c87e749ef14da4983a702cd',
                        'userId' => $user->getId(),
                        'ip' => '192.0.2.0',
-                       'headers' => array(
+                       'headers' => [
                                'USER-AGENT' => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0'
-                       )
-               );
+                       ]
+               ];
                // importScopedSession() sets these variables
-               $this->setMwGlobals( array(
+               $this->setMwGlobals( [
                        'wgUser' => new User,
                        'wgRequest' => new FauxRequest,
-               ) );
+               ] );
                $sc = RequestContext::importScopedSession( $sinfo ); // load new context
 
                $info = $context->exportSession();
@@ -91,7 +91,7 @@ class RequestContextTest extends MediaWikiTestCase {
                        MediaWiki\Session\SessionManager::getGlobalSession()->getId(),
                        "Correct context session ID."
                );
-               if ( \MediaWiki\Session\PhpSessionHandler::isEnabled() ) {
+               if ( \MediaWiki\Session\PHPSessionHandler::isEnabled() ) {
                        $this->assertEquals( $sinfo['sessionId'], session_id(), "Correct context session ID." );
                } else {
                        $this->assertEquals( $oldSessionId, session_id(), "Unchanged PHP session ID." );