Libraryupgrader has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400843 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
The following sniffs are failing and were disabled:
* Generic.Files.OneObjectStructurePerFile.MultipleFound
* Squiz.Scope.MethodScope.Missing
The following sniffs now pass and were enabled:
* MediaWiki.Files.OneClassPerFile.MultipleFound
Change-Id: I887c252bf05261c96b2d8887bd75ed689c667d95
---
M .phpcs.xml
M composer.json
M includes/JCSingleton.php
3 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JsonConfig
refs/changes/43/400843/1
diff --git a/.phpcs.xml b/.phpcs.xml
index d473d2b..af04394 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,12 +1,13 @@
<?xml version="1.0"?>
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude
name="Generic.Files.OneObjectStructurePerFile.MultipleFound" />
<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" />
+ <exclude name="Squiz.Scope.MethodScope.Missing" />
</rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc" />
diff --git a/composer.json b/composer.json
index 6c45e79..f3cbcc4 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": "14.1.0",
+ "mediawiki/mediawiki-codesniffer": "15.0.0",
"mediawiki/minus-x": "0.2.1"
},
"scripts": {
diff --git a/includes/JCSingleton.php b/includes/JCSingleton.php
index a64dafa..39fe303 100644
--- a/includes/JCSingleton.php
+++ b/includes/JCSingleton.php
@@ -461,7 +461,7 @@
} elseif ( $value instanceof JCTitle ) {
// Nothing to do
return $value;
- } elseif ( $namespace !== null && !is_integer( $namespace ) ) {
+ } elseif ( $namespace !== null && !is_int( $namespace ) ) {
throw new Exception( '$namespace parameter must be
either null or an integer' );
}
--
To view, visit https://gerrit.wikimedia.org/r/400843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I887c252bf05261c96b2d8887bd75ed689c667d95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/JsonConfig
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
