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

Change subject: Improve some parameter docs
......................................................................

Improve some parameter docs

Change-Id: I97dfe011c14765642b0c9954b2d692cfc8cfd5cd
---
M SpecialUserMerge.php
M phpcs.xml
2 files changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge 
refs/changes/44/384244/1

diff --git a/SpecialUserMerge.php b/SpecialUserMerge.php
index 9af48d5..00df946 100644
--- a/SpecialUserMerge.php
+++ b/SpecialUserMerge.php
@@ -68,7 +68,7 @@
        }
 
        /**
-        * @param $val user's input for username
+        * @param string $val user's input for username
         * @return bool|string true if valid, a string of the error's message 
key if validation failed
         */
        public function validateOldUser( $val ) {
@@ -88,7 +88,7 @@
        }
 
        /**
-        * @param $val user's input for username
+        * @param string $val user's input for username
         * @return bool|string true if valid, a string of the error's message 
key if validation failed
         */
        public function validateNewUser( $val ) {
diff --git a/phpcs.xml b/phpcs.xml
index 68d5963..61ba778 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,16 +2,13 @@
 <ruleset>
        <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
                <exclude 
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
-               <exclude 
name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
-               <exclude 
name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
                <exclude 
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
                <exclude 
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
        </rule>
        <rule ref="Generic.Files.LineLength">
-               <exclude-pattern>UserMerge.alias.php</exclude-pattern>
+               <exclude-pattern>UserMerge\.alias\.php</exclude-pattern>
        </rule>
        <file>.</file>
        <arg name="extensions" value="php,php5,inc" />
        <arg name="encoding" value="UTF-8" />
-       <exclude-pattern>vendor</exclude-pattern>
 </ruleset>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97dfe011c14765642b0c9954b2d692cfc8cfd5cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>

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

Reply via email to