jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403669 )
Change subject: Rename $wp variables to $wikiPage
......................................................................
Rename $wp variables to $wikiPage
Same as I450cfea was for $sk variables.
Change-Id: I295b4c9d181a65ad8ac2393e764b544754d5a698
---
M includes/api/ApiMobileView.php
M tests/phpunit/api/ApiMobileViewTest.php
2 files changed, 29 insertions(+), 21 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/includes/api/ApiMobileView.php b/includes/api/ApiMobileView.php
index 51448b9..e0720d3 100644
--- a/includes/api/ApiMobileView.php
+++ b/includes/api/ApiMobileView.php
@@ -333,8 +333,8 @@
*/
protected function isMainPage( $title ) {
if ( $title->isRedirect() && $this->followRedirects ) {
- $wp = $this->makeWikiPage( $title );
- $target = $wp->getRedirectTarget();
+ $wikiPage = $this->makeWikiPage( $title );
+ $target = $wikiPage->getRedirectTarget();
if ( $target ) {
return $target->isMainPage();
}
@@ -444,14 +444,18 @@
/**
* Performs a page parse
- * @param WikiPage $wp Wiki page object
+ * @param WikiPage $wikiPage Wiki page object
* @param ParserOptions $parserOptions Options for parser
* @param null|int $oldid Revision ID to get the text from, passing
null or 0 will
* get the current revision (default value)
* @return ParserOutput|null
*/
- protected function getParserOutput( WikiPage $wp, ParserOptions
$parserOptions, $oldid = null ) {
- $parserOutput = $wp->getParserOutput( $parserOptions, $oldid );
+ protected function getParserOutput(
+ WikiPage $wikiPage,
+ ParserOptions $parserOptions,
+ $oldid = null
+ ) {
+ $parserOutput = $wikiPage->getParserOutput( $parserOptions,
$oldid );
if ( $parserOutput && !defined(
'ParserOutput::SUPPORTS_STATELESS_TRANSFORMS' ) ) {
$parserOutput->setTOCEnabled( false );
}
@@ -544,9 +548,9 @@
$mfSpecialCaseMainPage = $mfConfig->get(
'MFSpecialCaseMainPage' );
$result = $this->getResult();
- $wp = $this->makeWikiPage( $title );
- if ( $this->followRedirects && $wp->isRedirect() ) {
- $newTitle = $wp->getRedirectTarget();
+ $wikiPage = $this->makeWikiPage( $title );
+ if ( $this->followRedirects && $wikiPage->isRedirect() ) {
+ $newTitle = $wikiPage->getRedirectTarget();
if ( $newTitle ) {
$title = $newTitle;
$textTitle = $title->getPrefixedText();
@@ -562,12 +566,12 @@
);
return [];
}
- $wp = $this->makeWikiPage( $title );
+ $wikiPage = $this->makeWikiPage( $title );
}
}
- $latest = $wp->getLatest();
+ $latest = $wikiPage->getLatest();
// Use page_touched so template updates invalidate cache
- $touched = $wp->getTouched();
+ $touched = $wikiPage->getTouched();
$revId = $oldid ? $oldid : $title->getLatestRevID();
if ( $this->file ) {
$key = $wgMemc->makeKey(
@@ -587,9 +591,9 @@
// Title::exists() above doesn't seem to always
catch recently deleted pages
$this->dieWithError( [ 'apierror-missingtitle'
] );
}
- $parserOptions = $this->makeParserOptions( $wp );
- $parserCacheKey =
\MediaWiki\MediaWikiServices::getInstance()->getParserCache()->getKey( $wp,
- $parserOptions );
+ $parserOptions = $this->makeParserOptions( $wikiPage );
+ $parserCache =
\MediaWiki\MediaWikiServices::getInstance()->getParserCache();
+ $parserCacheKey = $parserCache->getKey( $wikiPage,
$parserOptions );
$key = $wgMemc->makeKey(
'mf',
'mobileview',
@@ -610,7 +614,7 @@
if ( $this->file ) {
$html = $this->getFilePage( $title );
} else {
- $parserOutput = $this->getParserOutput( $wp,
$parserOptions, $oldid );
+ $parserOutput = $this->getParserOutput( $wikiPage,
$parserOptions, $oldid );
if ( $parserOutput === false ) {
$this->dieWithError(
'apierror-mobilefrontend-badidtitle', 'invalidparams' );
return;
@@ -643,14 +647,14 @@
}
}
- $data['lastmodified'] = wfTimestamp( TS_ISO_8601,
$wp->getTimestamp() );
+ $data['lastmodified'] = wfTimestamp( TS_ISO_8601,
$wikiPage->getTimestamp() );
// Page id
- $data['id'] = $wp->getId();
- $user = User::newFromId( $wp->getUser() );
+ $data['id'] = $wikiPage->getId();
+ $user = User::newFromId( $wikiPage->getUser() );
if ( !$user->isAnon() ) {
$data['lastmodifiedby'] = [
- 'name' => $wp->getUserText(),
+ 'name' => $wikiPage->getUserText(),
'gender' => $user->getOption( 'gender' ),
];
} else {
diff --git a/tests/phpunit/api/ApiMobileViewTest.php
b/tests/phpunit/api/ApiMobileViewTest.php
index 848a4fd..d793ce8 100644
--- a/tests/phpunit/api/ApiMobileViewTest.php
+++ b/tests/phpunit/api/ApiMobileViewTest.php
@@ -15,13 +15,17 @@
return Title::newFromRow( $row );
}
- protected function getParserOutput( WikiPage $wp, ParserOptions
$parserOptions, $oldid = null ) {
+ protected function getParserOutput(
+ WikiPage $wikiPage,
+ ParserOptions $parserOptions,
+ $oldid = null
+ ) {
$params = $this->extractRequestParams();
if ( !isset( $params['text'] ) ) {
throw new Exception( 'Must specify page text' );
}
$parser = new Parser();
- $po = $parser->parse( $params['text'], $wp->getTitle(),
$parserOptions );
+ $po = $parser->parse( $params['text'], $wikiPage->getTitle(),
$parserOptions );
if ( !defined( 'ParserOutput::SUPPORTS_STATELESS_TRANSFORMS' )
) {
$po->setTOCEnabled( false );
}
--
To view, visit https://gerrit.wikimedia.org/r/403669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I295b4c9d181a65ad8ac2393e764b544754d5a698
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Pmiazga <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
