[MediaWiki-commits] [Gerrit] mediawiki...LifeWeb[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[Libraryupgrader (Code Review)]

Libraryupgrader has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/400846 )

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: Ib3f1128dfb9cf44a18ab0ab9cdb23513ce935e3a
---
M .phpcs.xml
M composer.json
M lib/LifeWeb/LWItem.php
3 files changed, 7 insertions(+), 6 deletions(-)


git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LifeWeb refs/changes/46/400846/1

diff --git a/.phpcs.xml b/.phpcs.xml
index cf1aa43..27f8ba5 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,12 +1,13 @@
<?xml version="1.0"?>
<ruleset name="MediaWiki">
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude name="Generic.Files.OneObjectStructurePerFile.MultipleFound" />
<!-- Disable failing rules -->
<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
- <exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
+ <exclude name="Squiz.Scope.MethodScope.Missing" />
<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
</rule>
diff --git a/composer.json b/composer.json
index 1eb1853..ef88b49 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "14.1.0",
+ "mediawiki/mediawiki-codesniffer": "15.0.0",
"jakub-onderka/php-console-highlighter": "0.3.2",
"mediawiki/minus-x": "0.2.1"
},
diff --git a/lib/LifeWeb/LWItem.php b/lib/LifeWeb/LWItem.php
index 6ccb6ea..5d3ac40 100644
--- a/lib/LifeWeb/LWItem.php
+++ b/lib/LifeWeb/LWItem.php
@@ -48,10 +48,10 @@
$this->itemId = $itemId;

/*
- if (!\Wikibase\EntityLookup::hasEntity($itemId)) {
- throw new Exception('Invalid ID.');
- }
- */
+ if (!\Wikibase\EntityLookup::hasEntity($itemId)) {
+ throw new Exception('Invalid ID.');
+ }
+ */

if ( !self::instanceOfCheck( $itemId, $pidInstanceType, EntityIDs::pid( 'pInstanceOf' ) ) ) {
throw new \MWException( 'Is not an instance.' );
--
To view, visit https://gerrit.wikimedia.org/r/400846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3f1128dfb9cf44a18ab0ab9cdb23513ce935e3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LifeWeb
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <***@tools.wmflabs.org>

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400846 )

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: Ib3f1128dfb9cf44a18ab0ab9cdb23513ce935e3a
---
M .phpcs.xml
M composer.json
M lib/LifeWeb/LWItem.php
3 files changed, 7 insertions(+), 6 deletions(-)

Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index cf1aa43..4259c51 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,13 +2,14 @@
<ruleset name="MediaWiki">
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
<!-- Disable failing rules -->
+ <exclude name="Generic.Files.OneObjectStructurePerFile.MultipleFound" />
<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
<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="Squiz.Scope.MethodScope.Missing" />
</rule>
<file>.</file>
<arg name="encoding" value="UTF-8" />
diff --git a/composer.json b/composer.json
index 1eb1853..ef88b49 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "14.1.0",
+ "mediawiki/mediawiki-codesniffer": "15.0.0",
"jakub-onderka/php-console-highlighter": "0.3.2",
"mediawiki/minus-x": "0.2.1"
},
diff --git a/lib/LifeWeb/LWItem.php b/lib/LifeWeb/LWItem.php
index 6ccb6ea..5d3ac40 100644
--- a/lib/LifeWeb/LWItem.php
+++ b/lib/LifeWeb/LWItem.php
@@ -48,10 +48,10 @@
$this->itemId = $itemId;

/*
- if (!\Wikibase\EntityLookup::hasEntity($itemId)) {
- throw new Exception('Invalid ID.');
- }
- */
+ if (!\Wikibase\EntityLookup::hasEntity($itemId)) {
+ throw new Exception('Invalid ID.');
+ }
+ */

if ( !self::instanceOfCheck( $itemId, $pidInstanceType, EntityIDs::pid( 'pInstanceOf' ) ) ) {
throw new \MWException( 'Is not an instance.' );
--
To view, visit https://gerrit.wikimedia.org/r/400846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3f1128dfb9cf44a18ab0ab9cdb23513ce935e3a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LifeWeb
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <***@tools.wmflabs.org>
Gerrit-Reviewer: Umherirrender <***@web.de>
Gerrit-Reviewer: jenkins-bot <>