Rafidaslam has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398075 )
Change subject: Re-enable MediaWiki.Usage.ExtendClassUsage.FunctionVarUsage
sniff
......................................................................
Re-enable MediaWiki.Usage.ExtendClassUsage.FunctionVarUsage sniff
Bug: T170579
Change-Id: I0a97c332e01a99b3de3f86bdeaf1380d48a18a93
---
M .phpcs.xml
M includes/MobileFormatter.php
M tests/phpunit/MobileFormatterTest.php
M tests/phpunit/modules/MFResourceLoaderParsedMessageModuleTest.php
4 files changed, 9 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/75/398075/1
diff --git a/.phpcs.xml b/.phpcs.xml
index d1df064..a593df0 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -4,7 +4,6 @@
<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
<exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
- <exclude
name="MediaWiki.Usage.ExtendClassUsage.FunctionVarUsage"/>
</rule>
<rule ref="Generic.Files.LineLength">
<exclude-pattern>MobileFrontend\.alias\.php</exclude-pattern>
diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index 938f90b..40bc0c5 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -360,7 +360,7 @@
$parent = $list->parentNode;
$placeholder = $doc->createElement( 'a',
- wfMessage(
'mobile-frontend-references-list' ) );
+ $this->msg(
'mobile-frontend-references-list' ) );
$placeholder->setAttribute( 'class',
'mf-lazy-references-placeholder' );
// Note to render a reference we need to know
only its reference
// Note: You can have multiple <references> tag
on the same page, we render all of these in
@@ -528,7 +528,7 @@
foreach ( $domElemsToReplace as $element ) {
$alt = $element->getAttribute( 'alt' );
if ( $alt === '' ) {
- $alt = '[' . wfMessage(
'mobile-frontend-missing-image' )->inContentLanguage() . ']';
+ $alt = '[' . $this->msg(
'mobile-frontend-missing-image' )->inContentLanguage() . ']';
} else {
$alt = '[' . $alt . ']';
}
@@ -559,7 +559,7 @@
* @return string Wiki text
*/
protected function msg( $key ) {
- return wfMessage( $key )->text();
+ return $this->msg( $key )->text();
}
/**
@@ -696,7 +696,7 @@
$toc = $doc->createElement(
'div' );
$toc->setAttribute( 'id', 'toc'
);
$toc->setAttribute( 'class',
'toc-mobile' );
- $tocHeading =
$doc->createElement( 'h2', wfMessage( 'toc' )->text() );
+ $tocHeading =
$doc->createElement( 'h2', $this->msg( 'toc' )->text() );
$toc->appendChild( $tocHeading
);
$sectionBody->appendChild( $toc
);
}
diff --git a/tests/phpunit/MobileFormatterTest.php
b/tests/phpunit/MobileFormatterTest.php
index 3974697..b1e3b41 100644
--- a/tests/phpunit/MobileFormatterTest.php
+++ b/tests/phpunit/MobileFormatterTest.php
@@ -142,7 +142,7 @@
'class' => 'mf-lazy-references-placeholder',
'href' => $citeUrl,
],
- wfMessage( 'mobile-frontend-references-list' )
+ $this->msg( 'mobile-frontend-references-list' )
);
$refSectionHtml = $this->makeSectionHeading( 'h2', 'references'
)
. $this->makeSectionHtml( 1, $refplaceholder, true );
@@ -271,20 +271,20 @@
[
'<img src="kitty.jpg">',
'<span class="mw-mf-image-replacement">[' .
- wfMessage(
'mobile-frontend-missing-image' ) . ']</span>',
+ $this->msg(
'mobile-frontend-missing-image' ) . ']</span>',
$removeImages,
],
[
'<img alt src="kitty.jpg">',
'<span class="mw-mf-image-replacement">[' .
- wfMessage(
'mobile-frontend-missing-image' ) . ']</span>',
+ $this->msg(
'mobile-frontend-missing-image' ) . ']</span>',
$removeImages,
],
[
'<img alt src="kitty.jpg">look at the cute
kitty!' .
'<img alt="picture of angry dog"
src="dog.jpg">',
'<span class="mw-mf-image-replacement">[' .
- wfMessage(
'mobile-frontend-missing-image' ) . ']</span>look at the cute kitty!' .
+ $this->msg(
'mobile-frontend-missing-image' ) . ']</span>look at the cute kitty!' .
'<span
class="mw-mf-image-replacement">[picture of angry dog]</span>',
$removeImages,
],
diff --git a/tests/phpunit/modules/MFResourceLoaderParsedMessageModuleTest.php
b/tests/phpunit/modules/MFResourceLoaderParsedMessageModuleTest.php
index 44c3e37..1c761b2 100644
--- a/tests/phpunit/modules/MFResourceLoaderParsedMessageModuleTest.php
+++ b/tests/phpunit/modules/MFResourceLoaderParsedMessageModuleTest.php
@@ -41,7 +41,7 @@
}
public function providerAddParsedMessages() {
- $html = wfMessage( 'mobile-frontend-photo-license' )->parse();
+ $html = $this->msg( 'mobile-frontend-photo-license' )->parse();
$expected = Xml::encodeJsCall( 'mw.messages.set',
[ [ 'mobile-frontend-photo-license' => $html ]
] );
--
To view, visit https://gerrit.wikimedia.org/r/398075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a97c332e01a99b3de3f86bdeaf1380d48a18a93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
