jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375332 )
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
Change-Id: Ia50eabc45fcf4f27e01be0ccbfcf337d3ba30790
---
M HieroTokenizer.php
M composer.json
M phpcs.xml
M wikihiero.body.php
4 files changed, 7 insertions(+), 6 deletions(-)
Approvals:
Niharika29: Looks good to me, approved
jenkins-bot: Verified
diff --git a/HieroTokenizer.php b/HieroTokenizer.php
index fd4c648..a5ba7fb 100644
--- a/HieroTokenizer.php
+++ b/HieroTokenizer.php
@@ -54,7 +54,7 @@
/**
* Split text into blocks, then split blocks into items
*
- * @return array: tokenized text
+ * @return array tokenized text
*/
public function tokenize() {
if ( $this->blocks !== false ) {
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 d20f87d..b569216 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -4,6 +4,7 @@
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingReturn" />
+ <exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
diff --git a/wikihiero.body.php b/wikihiero.body.php
index 42e6a5d..802fb62 100644
--- a/wikihiero.body.php
+++ b/wikihiero.body.php
@@ -229,7 +229,7 @@
* @param $hiero string: text to convert
* @param $scale int: global scale in percentage (default = 100%)
* @param $line bool: use line (default = false)
- * @return string: converted code
+ * @return string converted code
*/
public function render( $hiero, $scale = self::DEFAULT_SCALE, $line =
false ) {
if ( $scale != self::DEFAULT_SCALE ) {
@@ -390,14 +390,14 @@
/**
* Returns a list of image files used by this extension
*
- * @return array: list of files in format 'file' => [ width, height ]
+ * @return array list of files in format 'file' => [ width, height ]
*/
public function getFiles() {
return self::$files;
}
/**
- * @return string: URL of images directory
+ * @return string URL of images directory
*/
public static function getImagePath() {
global $wgExtensionAssetsPath;
@@ -408,7 +408,7 @@
* Get glyph code from file name
*
* @param $file string: file name
- * @return string: converted code
+ * @return string converted code
*/
public static function getCode( $file ) {
return substr( $file, strlen( self::IMAGE_PREFIX ), -( 1 +
strlen( self::IMAGE_EXT ) ) );
--
To view, visit https://gerrit.wikimedia.org/r/375332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia50eabc45fcf4f27e01be0ccbfcf337d3ba30790
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/wikihiero
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <[email protected]>
Gerrit-Reviewer: Niharika29 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
