jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375221 )
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.OneClassPerFile.MultipleFound
Change-Id: Ic6fcb0a1b76b856605947575abd1fc0c77ac9885
---
M composer.json
M includes/JCCache.php
M includes/JCDefaultContentView.php
M includes/JCDefaultObjContentView.php
M phpcs.xml
5 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 96a1043..41bb0d7 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/includes/JCCache.php b/includes/JCCache.php
index 5f1c4a5..c852b2d 100644
--- a/includes/JCCache.php
+++ b/includes/JCCache.php
@@ -48,7 +48,7 @@
/**
* Retrieves content.
- * @return string|JCContent|false: Content string/object or false if
irretrievable.
+ * @return string|JCContent|false Content string/object or false if
irretrievable.
*/
public function get() {
if ( $this->content === null ) {
diff --git a/includes/JCDefaultContentView.php
b/includes/JCDefaultContentView.php
index c12a53f..e01eb81 100644
--- a/includes/JCDefaultContentView.php
+++ b/includes/JCDefaultContentView.php
@@ -48,7 +48,7 @@
* @param JCContent $content
* @param mixed $data
* @param array $path path to this field
- * @return string: HTML.
+ * @return string HTML.
*/
public function renderValue( JCContent $content, $data, array $path ) {
$isList = $this->isList( $content, $data, $path );
diff --git a/includes/JCDefaultObjContentView.php
b/includes/JCDefaultObjContentView.php
index d2895c5..ba1f766 100644
--- a/includes/JCDefaultObjContentView.php
+++ b/includes/JCDefaultObjContentView.php
@@ -39,7 +39,7 @@
* @param JCObjContent|JCContent $content
* @param mixed|JCValue $data
* @param array $path path to this field
- * @return string: HTML.
+ * @return string HTML.
*/
public function renderValue( JCContent $content, $data, array $path ) {
if ( is_a( $data, '\JsonConfig\JCValue' ) ) {
diff --git a/phpcs.xml b/phpcs.xml
index 21b2bef..d473d2b 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,6 +2,8 @@
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
+ <exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
+ <exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
<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/375221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6fcb0a1b76b856605947575abd1fc0c77ac9885
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/JsonConfig
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
