jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/358550 )
Change subject: Update mediawiki/codesniffer to 0.7.2
......................................................................
Update mediawiki/codesniffer to 0.7.2
Short array syntax will be used in follow ups
to keep this patch set small
Change-Id: Ibfb09fb93a827d2c23060e79d287c963fe149770
---
M SyntaxHighlight.ace.php
M composer.json
M phpcs.xml
3 files changed, 10 insertions(+), 7 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SyntaxHighlight.ace.php b/SyntaxHighlight.ace.php
index d01ca1b..712153d 100644
--- a/SyntaxHighlight.ace.php
+++ b/SyntaxHighlight.ace.php
@@ -27,7 +27,7 @@
'ABC' => [],
'ActionScript' => [ 'actionscript', 'actionscript3' ],
'ADA' => [ 'ada', 'ada2005', 'ada95' ],
- 'Apache_Conf' => [ 'apache', 'apacheconf', 'aconf'],
+ 'Apache_Conf' => [ 'apache', 'apacheconf', 'aconf' ],
'AsciiDoc' => [],
'Assembly_x86' => [ 'nasm' ],
'AutoHotKey' => [ 'autohotkey', 'ah' ],
@@ -45,7 +45,7 @@
'D' => [ 'd' ],
'Dart' => [ 'dart' ],
'Diff' => [ 'diff', 'udiff' ],
- 'Django' => [ 'django', 'html+django', 'html+jinja',
'htmldjango'],
+ 'Django' => [ 'django', 'html+django', 'html+jinja',
'htmldjango' ],
'Dockerfile' => [ 'Dockerfile', 'docker' ],
'Dot' => [],
'Dummy' => [],
@@ -111,7 +111,7 @@
'Perl' => [ 'perl', 'pl', 'perl6', 'pl6' ],
'pgSQL' => [ 'postgresql', 'postgres' ],
'PHP' => [ 'php', 'php3', 'php4', 'php5', 'html+php' ],
- 'Powershell' => [ 'powershell', 'posh', 'ps1', 'psm1'],
+ 'Powershell' => [ 'powershell', 'posh', 'ps1', 'psm1' ],
'Praat' => [ 'praat' ],
'Prolog' => [ 'prolog' ],
'Properties' => [ 'properties', 'jproperties' ],
diff --git a/composer.json b/composer.json
index bc3fc91..a708409 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.5.1",
+ "mediawiki/mediawiki-codesniffer": "0.7.2",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"license": "GPL-2.0+",
@@ -34,7 +34,7 @@
"scripts": {
"fix": "phpcbf",
"test": [
- "parallel-lint . --exclude vendor",
+ "parallel-lint . --exclude vendor --exclude
node_modules",
"phpcs -p -s"
]
}
diff --git a/phpcs.xml b/phpcs.xml
index d81a292..74319c5 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,11 @@
<?xml version="1.0"?>
<ruleset>
- <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+ <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude name="Generic.Arrays.DisallowLongArraySyntax.Found"/>
+ </rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc"/>
- <arg name="encoding" value="utf8"/>
+ <arg name="encoding" value="UTF-8"/>
<exclude-pattern>vendor</exclude-pattern>
+ <exclude-pattern>node_modules</exclude-pattern>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/358550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfb09fb93a827d2c23060e79d287c963fe149770
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
