Merge "TableDiffFormatter: Don't repeatedly call array_shift()"

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

diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php
index 25ffcb7..246ea3d 100644 (file)
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -11,7 +11,7 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
        /**
         * @var array
         */
-       protected $tablesUsed = array( 'user', 'user_groups', 'user_properties' );
+       protected $tablesUsed = [ 'user', 'user_groups', 'user_properties' ];
 
        protected function setUp() {
                global $wgServer;
@@ -21,26 +21,26 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 
                ApiQueryInfo::resetTokenCache(); // tokens are invalid because we cleared the session
 
-               self::$users = array(
+               self::$users = [
                        'sysop' => new TestUser(
                                'Apitestsysop',
                                'Api Test Sysop',
                                'api_test_sysop@example.com',
-                               array( 'sysop' )
+                               [ 'sysop' ]
                        ),
                        'uploader' => new TestUser(
                                'Apitestuser',
                                'Api Test User',
                                'api_test_user@example.com',
-                               array()
+                               []
                        )
-               );
+               ];
 
-               $this->setMwGlobals( array(
-                       'wgAuth' => new StubObject( 'wgAuth', 'AuthPlugin' ),
-                       'wgRequest' => new FauxRequest( array() ),
+               $this->setMwGlobals( [
+                       'wgAuth' => new AuthPlugin,
+                       'wgRequest' => new FauxRequest( [] ),
                        'wgUser' => self::$users['sysop']->user,
-               ) );
+               ] );
 
                $this->apiContext = new ApiTestContext();
        }
@@ -111,11 +111,11 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
                $module->execute();
 
                // construct result
-               $results = array(
-                       $module->getResult()->getResultData( null, array( 'Strip' => 'all' ) ),
+               $results = [
+                       $module->getResult()->getResultData( null, [ 'Strip' => 'all' ] ),
                        $context->getRequest(),
                        $context->getRequest()->getSessionArray()
-               );
+               ];
 
                if ( $appendModule ) {
                        $results[] = $module;
@@ -148,12 +148,12 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
                if ( isset( $session['wsToken'] ) && $session['wsToken'] ) {
                        // @todo Why does this directly mess with the session? Fix that.
                        // add edit token to fake session
-                       $session['wsEditToken'] = $session['wsToken'];
+                       $session['wsTokenSecrets']['default'] = $session['wsToken'];
                        // add token to request parameters
                        $timestamp = wfTimestamp();
                        $params['token'] = hash_hmac( 'md5', $timestamp, $session['wsToken'] ) .
                                dechex( $timestamp ) .
-                               User::EDIT_TOKEN_SUFFIX;
+                               MediaWiki\Session\Token::SUFFIX;
 
                        return $this->doApiRequest( $params, $session, false, $user );
                } else {
@@ -166,20 +166,20 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
                        throw new MWException( "Can not log in to undefined user $user" );
                }
 
-               $data = $this->doApiRequest( array(
+               $data = $this->doApiRequest( [
                        'action' => 'login',
                        'lgname' => self::$users[$user]->username,
-                       'lgpassword' => self::$users[$user]->password ) );
+                       'lgpassword' => self::$users[$user]->password ] );
 
                $token = $data[0]['login']['token'];
 
                $data = $this->doApiRequest(
-                       array(
+                       [
                                'action' => 'login',
                                'lgtoken' => $token,
                                'lgname' => self::$users[$user]->username,
                                'lgpassword' => self::$users[$user]->password,
-                       ),
+                       ],
                        $data[2]
                );
 
@@ -187,10 +187,10 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
        }
 
        protected function getTokenList( $user, $session = null ) {
-               $data = $this->doApiRequest( array(
+               $data = $this->doApiRequest( [
                        'action' => 'tokens',
                        'type' => 'edit|delete|protect|move|block|unblock|watch'
-               ), $session, false, $user->user );
+               ], $session, false, $user->user );
 
                if ( !array_key_exists( 'tokens', $data[0] ) ) {
                        throw new MWException( 'Api failed to return a token list' );