Thiemo Kreuz (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400392 )
Change subject: Fix inconsistent capitalization of different method calls
......................................................................
Fix inconsistent capitalization of different method calls
Change-Id: I9f5b9e59e8cdadf65e80077fe2d3a9822b4592fe
---
M includes/api/ApiEmailUser.php
M includes/api/ApiTag.php
M includes/specials/SpecialUncategorizedcategories.php
M tests/phpunit/includes/RevisionTest.php
M tests/phpunit/includes/api/ApiComparePagesTest.php
M tests/phpunit/includes/api/ApiParseTest.php
6 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/92/400392/1
diff --git a/includes/api/ApiEmailUser.php b/includes/api/ApiEmailUser.php
index edea266..84ea266 100644
--- a/includes/api/ApiEmailUser.php
+++ b/includes/api/ApiEmailUser.php
@@ -71,7 +71,7 @@
}
$result = array_filter( [
- 'result' => $retval->isGood() ? 'Success' : (
$retval->isOk() ? 'Warnings' : 'Failure' ),
+ 'result' => $retval->isGood() ? 'Success' : (
$retval->isOK() ? 'Warnings' : 'Failure' ),
'warnings' =>
$this->getErrorFormatter()->arrayFromStatus( $retval, 'warning' ),
'errors' =>
$this->getErrorFormatter()->arrayFromStatus( $retval, 'error' ),
] );
diff --git a/includes/api/ApiTag.php b/includes/api/ApiTag.php
index 9304c2b..c9f6db3 100644
--- a/includes/api/ApiTag.php
+++ b/includes/api/ApiTag.php
@@ -39,7 +39,7 @@
// Check if user can add tags
if ( $params['tags'] ) {
$ableToTag = ChangeTags::canAddTagsAccompanyingChange(
$params['tags'], $user );
- if ( !$ableToTag->isOk() ) {
+ if ( !$ableToTag->isOK() ) {
$this->dieStatus( $ableToTag );
}
}
diff --git a/includes/specials/SpecialUncategorizedcategories.php
b/includes/specials/SpecialUncategorizedcategories.php
index 5ff9e04..2dcb77f 100644
--- a/includes/specials/SpecialUncategorizedcategories.php
+++ b/includes/specials/SpecialUncategorizedcategories.php
@@ -60,7 +60,7 @@
$title = Title::makeTitleSafe(
NS_CATEGORY, $titleStr );
}
if ( $title ) {
- $this->exceptionList[] =
$title->getDBKey();
+ $this->exceptionList[] =
$title->getDBkey();
}
}
}
diff --git a/tests/phpunit/includes/RevisionTest.php
b/tests/phpunit/includes/RevisionTest.php
index 80257cc..0db76ff 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -43,7 +43,7 @@
->method( 'getPrefixedText' )
->will( $this->returnValue( 'RevisionTest' ) );
$mock->expects( $this->any() )
- ->method( 'getDBKey' )
+ ->method( 'getDBkey' )
->will( $this->returnValue( 'RevisionTest' ) );
$mock->expects( $this->any() )
->method( 'getArticleID' )
diff --git a/tests/phpunit/includes/api/ApiComparePagesTest.php
b/tests/phpunit/includes/api/ApiComparePagesTest.php
index 989d6bb..9399ef8 100644
--- a/tests/phpunit/includes/api/ApiComparePagesTest.php
+++ b/tests/phpunit/includes/api/ApiComparePagesTest.php
@@ -29,7 +29,7 @@
$status = $page->doEditContent(
$content, 'Test for ApiComparePagesTest: ' . $text, 0,
false, $user
);
- if ( !$status->isOk() ) {
+ if ( !$status->isOK() ) {
$this->fail( "Failed to create $title: " .
$status->getWikiText( false, false, 'en' ) );
}
return $status->value['revision']->getId();
diff --git a/tests/phpunit/includes/api/ApiParseTest.php
b/tests/phpunit/includes/api/ApiParseTest.php
index 07bf299..e236437 100644
--- a/tests/phpunit/includes/api/ApiParseTest.php
+++ b/tests/phpunit/includes/api/ApiParseTest.php
@@ -21,7 +21,7 @@
ContentHandler::makeContent( 'Test for revdel', $title,
CONTENT_MODEL_WIKITEXT ),
__METHOD__ . ' Test for revdel', 0, false, $user
);
- if ( !$status->isOk() ) {
+ if ( !$status->isOK() ) {
$this->fail( "Failed to create $title: " .
$status->getWikiText( false, false, 'en' ) );
}
self::$pageId = $status->value['revision']->getPage();
@@ -31,7 +31,7 @@
ContentHandler::makeContent( 'Test for oldid', $title,
CONTENT_MODEL_WIKITEXT ),
__METHOD__ . ' Test for oldid', 0, false, $user
);
- if ( !$status->isOk() ) {
+ if ( !$status->isOK() ) {
$this->fail( "Failed to edit $title: " .
$status->getWikiText( false, false, 'en' ) );
}
self::$revIds['oldid'] = $status->value['revision']->getId();
@@ -40,7 +40,7 @@
ContentHandler::makeContent( 'Test for latest', $title,
CONTENT_MODEL_WIKITEXT ),
__METHOD__ . ' Test for latest', 0, false, $user
);
- if ( !$status->isOk() ) {
+ if ( !$status->isOK() ) {
$this->fail( "Failed to edit $title: " .
$status->getWikiText( false, false, 'en' ) );
}
self::$revIds['latest'] = $status->value['revision']->getId();
--
To view, visit https://gerrit.wikimedia.org/r/400392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f5b9e59e8cdadf65e80077fe2d3a9822b4592fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
