jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368091 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Change-Id: Ifafccf48234a036349ac41cc398171081398e1e7
---
M RSSParser.php
M composer.json
M phpcs.xml
3 files changed, 6 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/RSSParser.php b/RSSParser.php
index 8bdd42a..a1c7159 100644
--- a/RSSParser.php
+++ b/RSSParser.php
@@ -182,7 +182,7 @@
/**
* Retrieve the URL from the cache
* @param $key String: lookup key to associate with this item
- * @return boolean
+ * @return bool
*/
protected function loadFromCache( $key ) {
global $wgMemc, $wgRSSCacheCompare;
@@ -218,7 +218,7 @@
/**
* Store these objects (i.e. etag, lastModified, and RSS) in the cache.
* @param $key String: lookup key to associate with this item
- * @return boolean
+ * @return bool
*/
protected function storeInCache( $key ) {
global $wgMemc, $wgRSSCacheAge;
@@ -575,7 +575,7 @@
* Determine if a given item should or should not be displayed
*
* @param $item Array: associative array that RSSData produced for an
<item>
- * @return boolean
+ * @return bool
*/
protected function canDisplay( array $item ) {
$check = '';
@@ -602,7 +602,7 @@
* @param $text String: the text to examine
* @param $filterType String: "filterOut" to check for matches in the
filterOut member list.
* Otherwise, uses the filter member list.
- * @return Boolean: decision to filter or not.
+ * @return bool Decision to filter or not.
*/
protected function filter( $text, $filterType ) {
if ( $filterType === 'filterOut' ) {
diff --git a/composer.json b/composer.json
index 4f55859..bf202bf 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
- "mediawiki/mediawiki-codesniffer": "0.10.0"
+ "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index 49a1a4f..f91e839 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,7 +11,5 @@
</rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc" />
- <arg name="encoding" value="utf8" />
- <exclude-pattern>vendor</exclude-pattern>
- <exclude-pattern>node_modules</exclude-pattern>
+ <arg name="encoding" value="UTF-8" />
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/368091
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifafccf48234a036349ac41cc398171081398e1e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RSS
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: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
