jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375322 )
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: Id915b21c4b2f62d7cde92cb58051ca3960e8716e
---
M InfoPage.php
M WikimediaIncubator.class.php
M composer.json
M phpcs.xml
4 files changed, 7 insertions(+), 6 deletions(-)
Approvals:
Niharika29: Looks good to me, approved
jenkins-bot: Verified
diff --git a/InfoPage.php b/InfoPage.php
index 76c95d0..b1aeb2f 100644
--- a/InfoPage.php
+++ b/InfoPage.php
@@ -94,7 +94,7 @@
}
/**
- * @return String: list of clickable logos of other projects
+ * @return String list of clickable logos of other projects
* (Wikipedia, Wiktionary, ...)
*/
public function listOtherProjects() {
@@ -111,7 +111,7 @@
}
/**
- * @return String: list of clickable logos of multilingual projects
+ * @return String list of clickable logos of multilingual projects
* (Meta, Commons, ...)
*/
public function listMultilingualProjects() {
@@ -132,7 +132,7 @@
}
/**
- * @return String: "Welcome to Incubator" message
+ * @return String "Welcome to Incubator" message
*/
public function showWelcome() {
return Html::rawElement( 'div', [ 'class' =>
'wminc-infopage-welcome' ],
@@ -140,7 +140,7 @@
}
/**
- * @return String: the core HTML for the info page
+ * @return String the core HTML for the info page
*/
public function StandardInfoPage( $beforetitle, $aftertitle, $content )
{
global $wgLang;
diff --git a/WikimediaIncubator.class.php b/WikimediaIncubator.class.php
index 2d6ba27..3691677 100644
--- a/WikimediaIncubator.class.php
+++ b/WikimediaIncubator.class.php
@@ -470,7 +470,7 @@
* @param $setting String: the setting to call
* @param $lang String: the language code
* @param $project String: the project code or name
- * @return Mixed: the setting from $wgConf->settings
+ * @return Mixed the setting from $wgConf->settings
*/
public static function getConf( $setting, $lang, $project ) {
if ( !self::canWeCheckDB() ) {
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 b7515b8..027c290 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -7,6 +7,7 @@
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingReturn" />
<exclude
name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
<exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle"
/>
+ <exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
<exclude
name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
--
To view, visit https://gerrit.wikimedia.org/r/375322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id915b21c4b2f62d7cde92cb58051ca3960e8716e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaIncubator
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <[email protected]>
Gerrit-Reviewer: Legoktm <[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
