jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368029 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Change-Id: If8d9c572ff5811be1149252f5a188bb9913eac4a
---
M composer.json
M includes/MobileFrontend.body.php
M includes/MobileFrontend.skin.hooks.php
M includes/specials/SpecialMobileWatchlist.php
M phpcs.xml
5 files changed, 9 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/composer.json b/composer.json
index 1366381..55507be 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.10.0",
+ "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/MobileFrontend.body.php b/includes/MobileFrontend.body.php
index 3133d76..8256a36 100644
--- a/includes/MobileFrontend.body.php
+++ b/includes/MobileFrontend.body.php
@@ -83,7 +83,7 @@
$pageUserId = User::idFromName( $title->getText() );
if ( $pageUserId && !$title->exists() ) {
$pageUser = User::newFromId( $pageUserId );
- $contentHtml =
ExtMobileFrontend::getUserPageContent(
+ $contentHtml = self::getUserPageContent(
$out, $pageUser );
}
}
diff --git a/includes/MobileFrontend.skin.hooks.php
b/includes/MobileFrontend.skin.hooks.php
index 0f48b61..e0fe06f 100644
--- a/includes/MobileFrontend.skin.hooks.php
+++ b/includes/MobileFrontend.skin.hooks.php
@@ -186,9 +186,9 @@
// Certain pages might be blacklisted and not have a mobile
equivalent.
if ( !$ctx->isBlacklistedPage() ) {
if ( $ctx->shouldDisplayMobileView() ) {
- MobileFrontendSkinHooks::mobileFooter( $skin,
$tpl, $ctx, $title, $req );
+ self::mobileFooter( $skin, $tpl, $ctx, $title,
$req );
} else {
- MobileFrontendSkinHooks::desktopFooter( $skin,
$tpl, $ctx, $title, $req );
+ self::desktopFooter( $skin, $tpl, $ctx, $title,
$req );
}
}
}
diff --git a/includes/specials/SpecialMobileWatchlist.php
b/includes/specials/SpecialMobileWatchlist.php
index 6c31999..19e6a0f 100644
--- a/includes/specials/SpecialMobileWatchlist.php
+++ b/includes/specials/SpecialMobileWatchlist.php
@@ -149,9 +149,9 @@
$attrsList = $attrsFeed = [];
// https://phabricator.wikimedia.org/T150650
if ( $view === null ) {
- $view = $user->getOption(
SpecialMobileWatchlist::VIEW_OPTION_NAME, 'a-z' );
+ $view = $user->getOption( self::VIEW_OPTION_NAME, 'a-z'
);
}
- $filter = $user->getOption(
SpecialMobileWatchlist::FILTER_OPTION_NAME, 'all' );
+ $filter = $user->getOption( self::FILTER_OPTION_NAME, 'all' );
if ( $view === 'feed' ) {
$attrsList[ 'class' ] = MobileUI::buttonClass();
diff --git a/phpcs.xml b/phpcs.xml
index 08a1d0b..f668c64 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -7,19 +7,17 @@
<exclude name="MediaWiki.Commenting.FunctionComment"/>
</rule>
<rule ref="Generic.Files.LineLength">
- <exclude-pattern>MobileFrontend.alias.php</exclude-pattern>
+ <exclude-pattern>MobileFrontend\.alias\.php</exclude-pattern>
</rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc"/>
<arg name="encoding" value="UTF-8"/>
- <exclude-pattern>vendor</exclude-pattern>
- <exclude-pattern>node_modules</exclude-pattern>
<rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
<properties>
<property name="equalsSpacing" value="1" />
- <property name="requiredSpacesAfterOpen"
value="1"/>
- <property name="requiredSpacesBeforeClose"
value="1" />
+ <property name="requiredSpacesAfterOpen" value="1"/>
+ <property name="requiredSpacesBeforeClose" value="1" />
</properties>
</rule>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/368029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If8d9c572ff5811be1149252f5a188bb9913eac4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: Pmiazga <pmia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
