Use namespaced ScopedCallback

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

diff --git a/tests/phpunit/includes/api/ApiBlockTest.php b/tests/phpunit/includes/api/ApiBlockTest.php
index e0488b7..d2dccf9 100644 (file)
--- a/tests/phpunit/includes/api/ApiBlockTest.php
+++ b/tests/phpunit/includes/api/ApiBlockTest.php
@@ -17,12 +17,12 @@ class ApiBlockTest extends ApiTestCase {
                return $this->getTokenList( self::$users['sysop'] );
        }
 
-       function addDBData() {
+       function addDBDataOnce() {
                $user = User::newFromName( 'UTApiBlockee' );
 
                if ( $user->getId() == 0 ) {
                        $user->addToDatabase();
-                       $user->setPassword( 'UTApiBlockeePassword' );
+                       TestUser::setPasswordForUser( $user, 'UTApiBlockeePassword' );
 
                        $user->saveSettings();
                }
@@ -49,11 +49,11 @@ class ApiBlockTest extends ApiTestCase {
                        $this->markTestIncomplete( "No block token found" );
                }
 
-               $this->doApiRequest( array(
+               $this->doApiRequest( [
                        'action' => 'block',
                        'user' => 'UTApiBlockee',
                        'reason' => 'Some reason',
-                       'token' => $tokens['blocktoken'] ), null, false, self::$users['sysop']->getUser() );
+                       'token' => $tokens['blocktoken'] ], null, false, self::$users['sysop']->getUser() );
 
                $block = Block::newFromTarget( 'UTApiBlockee' );
 
@@ -70,11 +70,11 @@ class ApiBlockTest extends ApiTestCase {
         */
        public function testBlockingActionWithNoToken() {
                $this->doApiRequest(
-                       array(
+                       [
                                'action' => 'block',
                                'user' => 'UTApiBlockee',
                                'reason' => 'Some reason',
-                       ),
+                       ],
                        null,
                        false,
                        self::$users['sysop']->getUser()