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

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
......................................................................

build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected
* MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
* MediaWiki.Commenting.FunctionComment.WrongStyle

The following sniffs now pass and were enabled:
* MediaWiki.Commenting.FunctionComment

Change-Id: I536e30d4c89e6d0e99ee0f22bf95d58dbcd6bcb0
---
M Collection.suggest.php
A OfflineContentGenerator
M RenderingAPI.php
M composer.json
M phpcs.xml
5 files changed, 13 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection 
refs/changes/63/371263/1

diff --git a/Collection.suggest.php b/Collection.suggest.php
index b796989..27b0d12 100644
--- a/Collection.suggest.php
+++ b/Collection.suggest.php
@@ -448,7 +448,7 @@
                        }
                        $link = $resolved->getText();
 
-                       if ( isset ( $linkmap[$link] ) ) {
+                       if ( isset( $linkmap[$link] ) ) {
                                $linkmap[$link][$link] = true;
                        } else {
                                $linkmap[$link] = [ $link => true ];
diff --git a/OfflineContentGenerator b/OfflineContentGenerator
new file mode 160000
index 0000000..a7a79cc
--- /dev/null
+++ b/OfflineContentGenerator
@@ -0,0 +1 @@
+Subproject commit a7a79ccc3f7cf774cf42f91991381b2799df0ff6
diff --git a/RenderingAPI.php b/RenderingAPI.php
index 96a6594..4d92fee 100644
--- a/RenderingAPI.php
+++ b/RenderingAPI.php
@@ -366,7 +366,7 @@
         * @return string: Internal (not user-facing) error description
         */
        protected function getError() {
-               if ( isset ( $this->response['error'] ) ) {
+               if ( isset( $this->response['error'] ) ) {
                        return $this->response['error'];
                }
                return '(error unknown)';
diff --git a/composer.json b/composer.json
index 8d05f89..784479c 100644
--- a/composer.json
+++ b/composer.json
@@ -3,10 +3,9 @@
        "type": "mediawiki-extension",
        "description": "The Collection extension allows users to collect 
articles and generate downloadable versions in different formats (PDF, 
OpenDocument, Text, etc.) for article collections and single articles.",
        "homepage": "http://www.mediawiki.org/wiki/Extension:Collection";,
-       "license" : "GPL-2.0+",
-
+       "license": "GPL-2.0+",
        "require": {
-               "composer/installers" : ">=1.0.1"
+               "composer/installers": ">=1.0.1"
        },
        "config": {
                "prepend-autoloader": false,
@@ -15,7 +14,7 @@
        "require-dev": {
                "jakub-onderka/php-parallel-lint": "0.9.2",
                "jakub-onderka/php-console-highlighter": "0.3.2",
-               "mediawiki/mediawiki-codesniffer": "0.10.1"
+               "mediawiki/mediawiki-codesniffer": "0.11.0"
        },
        "scripts": {
                "fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index 9b9ed4f..6d7a224 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ruleset>
        <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+               <exclude 
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
+               <exclude 
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
+               <exclude 
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
+               <exclude 
name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
+               <exclude 
name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
+               <exclude 
name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
+               <exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle" 
/>
                <exclude 
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
                <exclude 
name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName"/>
-               <exclude name="MediaWiki.Commenting.FunctionComment"/>
        </rule>
        <rule ref="Generic.Files.LineLength">
                <exclude-pattern>*/templates/*\.php</exclude-pattern>

-- 
To view, visit https://gerrit.wikimedia.org/r/371263
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I536e30d4c89e6d0e99ee0f22bf95d58dbcd6bcb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to