Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make ApiCreateAccount return camelcase statuses

Browse source 
Bug: 61663
Change-Id: I214d8eb7c9d49f55f49c5228c92806601c5499f6
This commit is contained in:
YuviPanda 2014-02-20 20:36:59 +05:30
parent 1bebd5d785
commit efcf0a3f61
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/api/ApiCreateAccount.php
View file

@ -138,13 +138,13 @@ class ApiCreateAccount extends ApiBase {
// since not having the correct token is part of the normal
// flow of events.
$result['token'] = LoginForm::getCreateaccountToken();
$result['result'] = 'needtoken';
$result['result'] = 'NeedToken';
} elseif ( !$status->isOK() ) {
// There was an error. Die now.
$this->dieStatus( $status );
} elseif ( !$status->isGood() ) {
// Status is not good, but OK. This means warnings.
$result['result'] = 'warning';
$result['result'] = 'Warning';
// Add any warnings to the result
$warnings = $status->getErrorsByType( 'warning' );
@ -157,7 +157,7 @@ class ApiCreateAccount extends ApiBase {
}
} else {
// Everything was fine.
$result['result'] = 'success';
$result['result'] = 'Success';
}
// Give extensions a chance to modify the API result data
@ -229,9 +229,9 @@ class ApiCreateAccount extends ApiBase {
'createaccount' => array(
'result' => array(
ApiBase::PROP_TYPE => array(
'success',
'warning',
'needtoken'
'Success',
'Warning',
'NeedToken'
)
),
'username' => array(

4
tests/phpunit/includes/api/ApiCreateAccountTest.php
View file

@ -45,7 +45,7 @@ class ApiCreateAccountTest extends ApiTestCase {
// Should first ask for token.
$a = $result['createaccount'];
$this->assertEquals( 'needtoken', $a['result'] );
$this->assertEquals( 'NeedToken', $a['result'] );
$token = $a['token'];
// Finally create the account
@ -63,7 +63,7 @@ class ApiCreateAccountTest extends ApiTestCase {
$result = $ret[0];
$this->assertNotInternalType( 'bool', $result );
$this->assertEquals( 'success', $result['createaccount']['result'] );
$this->assertEquals( 'Success', $result['createaccount']['result'] );
// Try logging in with the new user.
$ret = $this->doApiRequest( array(