Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/371468 )
Change subject: Remove broken bootstrap from phpcs.xml
......................................................................
Remove broken bootstrap from phpcs.xml
The bootstrap shows warnings and some unwanted code styles bypassed
phpcs
Bug: T172933
Change-Id: I29e776662055077f6de3a9bc6d0869120b387ea7
---
M includes/OutputPage.php
M includes/changes/ChangesList.php
M phpcs.xml
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/68/371468/1
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 7a2cf00..6aa11f6 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2913,7 +2913,7 @@
// Use an IE conditional comment to serve the script only to
old IE
$pieces[] = '<!--[if lt IE 9]>' .
Html::element( 'script', [
- 'src' => OutputPage::transformResourcePath(
+ 'src' => self::transformResourcePath(
$this->getConfig(),
"/resources/lib/html5shiv/html5shiv{$min}.js"
),
diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index 2182c6c..04f815a 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -753,11 +753,12 @@
switch ( $type ) {
case RecentChange::SRC_EDIT:
case RecentChange::SRC_NEW:
- $attrs[ 'data-mw-revid' ] =
$rc->mAttribs['rc_this_oldid'];
+ $attrs['data-mw-revid'] =
$rc->mAttribs['rc_this_oldid'];
break;
case RecentChange::SRC_LOG:
- $attrs[ 'data-mw-logid' ] =
$rc->mAttribs['rc_logid'];
- $attrs[ 'data-mw-logaction' ] =
$rc->mAttribs['rc_log_type'] . '/' . $rc->mAttribs['rc_log_action'];
+ $attrs['data-mw-logid'] =
$rc->mAttribs['rc_logid'];
+ $attrs['data-mw-logaction'] =
+ $rc->mAttribs['rc_log_type'] . '/' .
$rc->mAttribs['rc_log_action'];
break;
}
diff --git a/phpcs.xml b/phpcs.xml
index d2e4fcc..7f1002e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -43,7 +43,6 @@
<exclude-pattern>*/includes/StubObject.php</exclude-pattern>
</rule>
<file>.</file>
- <arg name="bootstrap"
value="vendor/mediawiki/mediawiki-codesniffer/utils/bootstrap-ci.php"/>
<arg name="encoding" value="UTF-8"/>
<arg name="extensions" value="php,php5,inc,sample"/>
<exclude-pattern type="relative">^extensions/</exclude-pattern>
--
To view, visit https://gerrit.wikimedia.org/r/371468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29e776662055077f6de3a9bc6d0869120b387ea7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
