jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/360098 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
* MediaWiki.FunctionComment.Missing.Public
Change-Id: I1e58f44a2dd26984b8dfc587c0b8ffa5b45cb0c6
---
M ThreeDHandler.php
M composer.json
M phpcs.xml
3 files changed, 11 insertions(+), 5 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ThreeDHandler.php b/ThreeDHandler.php
index 9c7b271..0536a53 100644
--- a/ThreeDHandler.php
+++ b/ThreeDHandler.php
@@ -92,7 +92,7 @@
// $wg3dProcessor can be string (e.g. '/path/to/3d2png.js') or
array
// (e.g. ['xvfb-run', '-a', '-s', '-ac -screen 0 1280x1024x24',
'/path/to/3d2png.js'])
- $cmd = wfEscapeShellArg( array_merge( (array) $wg3dProcessor, [
+ $cmd = wfEscapeShellArg( array_merge( (array)$wg3dProcessor, [
$srcPath,
sprintf( '%dx%d', $width, $height ),
$dstPath
diff --git a/composer.json b/composer.json
index 3e676f3..858a1ef 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.7.2",
+ "mediawiki/mediawiki-codesniffer": "0.9.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index d81a292..2ad1053 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,14 @@
<?xml version="1.0"?>
<ruleset>
- <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+ <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.ParamNameNoMatch" />
+ <exclude name="MediaWiki.FunctionComment.Missing.Public" />
+ </rule>
<file>.</file>
- <arg name="extensions" value="php,php5,inc"/>
- <arg name="encoding" value="utf8"/>
+ <arg name="extensions" value="php,php5,inc" />
+ <arg name="encoding" value="utf8" />
<exclude-pattern>vendor</exclude-pattern>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/360098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e58f44a2dd26984b8dfc587c0b8ffa5b45cb0c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/3D
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
