jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375271 )
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: I20d12c4d306f38e86c3ea91afbfae31e0a358022
---
M composer.json
M includes/page/ProofreadPageDbConnector.php
M includes/page/ProofreadPagePage.php
M phpcs.xml
4 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Niharika29: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index f9b12ef..c0cdd39 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.11.0",
+ "mediawiki/mediawiki-codesniffer": "0.12.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/page/ProofreadPageDbConnector.php
b/includes/page/ProofreadPageDbConnector.php
index fc89a83..8080a94 100644
--- a/includes/page/ProofreadPageDbConnector.php
+++ b/includes/page/ProofreadPageDbConnector.php
@@ -84,7 +84,7 @@
/**
* @param string $pages
- * @return integer|null
+ * @return int|null
*/
public static function getNumberOfExistingPagesFromPageTitle( $pages ) {
$dbr = wfGetDB( DB_SLAVE );
@@ -137,7 +137,7 @@
/**
* @param int $id
- * @return integer|null
+ * @return int|null
*/
public static function countTransclusionFromPageId( $id ) {
$dbr = wfGetDB( DB_SLAVE );
diff --git a/includes/page/ProofreadPagePage.php
b/includes/page/ProofreadPagePage.php
index e179544..27cdbde 100644
--- a/includes/page/ProofreadPagePage.php
+++ b/includes/page/ProofreadPagePage.php
@@ -75,7 +75,7 @@
/**
* Returns number of the page in the file if it's a multi-page file or
null
- * @return integer|null
+ * @return int|null
*/
public function getPageNumber() {
$parts = explode( '/', $this->title->getText() );
diff --git a/phpcs.xml b/phpcs.xml
index 46d4aa9..97c8950 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,6 +11,8 @@
<exclude
name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
<exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle"
/>
<exclude
name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures"
/>
+ <exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
+ <exclude name="MediaWiki.Files.ClassMatchesFilename.WrongCase"
/>
<exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
</rule>
<rule ref="MediaWiki.NamingConventions.ValidGlobalName">
--
To view, visit https://gerrit.wikimedia.org/r/375271
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I20d12c4d306f38e86c3ea91afbfae31e0a358022
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
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
