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

[Umherirrender (Code Review)]

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

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

build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: I515dc1003bd5ee2352c85ac49e19f54e7036bd5d
---
M ApiVisualEditor.php
M composer.json
M modules/ve-mw-collab/SpecialCollabPad.php
3 files changed, 6 insertions(+), 7 deletions(-)


git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/02/401102/1

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 3878598..dd94163 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -672,9 +672,8 @@
ExtensionRegistry::getInstance()->getAttribute( 'VisualEditorAvailableContentModels' ),
$config->get( 'VisualEditorAvailableContentModels' )
);
- return
- isset( $availableContentModels[ $contentModel ] ) &&
- $availableContentModels[ $contentModel ];
+ return isset( $availableContentModels[$contentModel] ) &&
+ $availableContentModels[$contentModel];
}

/**
diff --git a/composer.json b/composer.json
index 78b5e96..7f42a6e 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/modules/ve-mw-collab/SpecialCollabPad.php b/modules/ve-mw-collab/SpecialCollabPad.php
index 14ad803..06d14af 100644
--- a/modules/ve-mw-collab/SpecialCollabPad.php
+++ b/modules/ve-mw-collab/SpecialCollabPad.php
@@ -12,7 +12,7 @@
*/
private $output = null;

- function __construct() {
+ public function __construct() {
parent::__construct( 'CollabPad' );
}

@@ -25,12 +25,12 @@
return !!$wgVisualEditorRebaserURL && parent::userCanExecute( $user );
}

- function isListed() {
+ protected function isListed() {
global $wgVisualEditorRebaserURL;
return !!$wgVisualEditorRebaserURL;
}

- function execute( $par ) {
+ public function execute( $par ) {
$this->setHeaders();
$this->checkPermissions();
--
To view, visit https://gerrit.wikimedia.org/r/401102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I515dc1003bd5ee2352c85ac49e19f54e7036bd5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <***@web.de>