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

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

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I66b497f2afbb966465d084bf6d0a8e5e26917d57
---
M WikiEditor.hooks.php
M composer.json
M phpcs.xml
3 files changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor 
refs/changes/95/368095/1

diff --git a/WikiEditor.hooks.php b/WikiEditor.hooks.php
index 084584d..3feb713 100644
--- a/WikiEditor.hooks.php
+++ b/WikiEditor.hooks.php
@@ -298,7 +298,7 @@
         */
        public static function resourceLoaderGetConfigVars( &$vars ) {
                // expose magic words for use by the wikieditor toolbar
-               WikiEditorHooks::getMagicWords( $vars );
+               self::getMagicWords( $vars );
 
                $vars['mw.msg.wikieditor'] = wfMessage( 'sig-text', '~~~~' 
)->inContentLanguage()->text();
 
@@ -382,7 +382,7 @@
         *
         * @param EditPage $editPage
         * @param Status $status
-        * @return boolean
+        * @return bool
         */
        public static function editPageAttemptSave( EditPage $editPage ) {
                $article = $editPage->getArticle();
@@ -403,7 +403,7 @@
         *
         * @param EditPage $editPage
         * @param Status $status
-        * @return boolean
+        * @return bool
         */
        public static function editPageAttemptSaveAfter( EditPage $editPage, 
Status $status ) {
                $article = $editPage->getArticle();
diff --git a/composer.json b/composer.json
index a8fa313..8e34fa5 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
        "license": "GPL-2.0+",
        "require-dev": {
                "jakub-onderka/php-parallel-lint": "0.9.2",
-               "mediawiki/mediawiki-codesniffer": "0.10.0",
+               "mediawiki/mediawiki-codesniffer": "0.10.1",
                "jakub-onderka/php-console-highlighter": "0.3.2"
        },
        "scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index c59bea4..cb559ef 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,6 +11,5 @@
        </rule>
        <file>.</file>
        <arg name="extensions" value="php,php5,inc"/>
-       <arg name="encoding" value="utf8"/>
-       <exclude-pattern>vendor</exclude-pattern>
+       <arg name="encoding" value="UTF-8"/>
 </ruleset>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66b497f2afbb966465d084bf6d0a8e5e26917d57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
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