jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375313 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.12.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.12.0
The following sniffs are failing and were disabled:
* MediaWiki.Files.ClassMatchesFilename.NotMatch
* MediaWiki.Files.ClassMatchesFilename.WrongCase
Change-Id: I6d5b10b042c55cc453567925f7a4d096c47157a7
---
M UrlShortener.utils.php
M composer.json
M phpcs.xml
3 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UrlShortener.utils.php b/UrlShortener.utils.php
index d13af55..6d526cd 100644
--- a/UrlShortener.utils.php
+++ b/UrlShortener.utils.php
@@ -273,7 +273,7 @@
* Decode a compact string to produce an integer, or false if the input
is invalid.
*
* @param $s string
- * @return integer|false
+ * @return int|false
*/
public static function decodeId( $s ) {
global $wgUrlShortenerIdSet;
diff --git a/composer.json b/composer.json
index 770de83..1f40cca 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.11.0"
+ "mediawiki/mediawiki-codesniffer": "0.12.0"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index 518b716..66c930b 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -5,6 +5,8 @@
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
<exclude
name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
+ <exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
+ <exclude name="MediaWiki.Files.ClassMatchesFilename.WrongCase"
/>
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
--
To view, visit https://gerrit.wikimedia.org/r/375313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d5b10b042c55cc453567925f7a4d096c47157a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UrlShortener
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
