Skip to content

Commit 5434609

Browse files
authored
Merge pull request #108 from wmde/wbCs
Use Wikibase's CodeSniffer instead of MediaWiki's
2 parents 261c5b3 + 4540fdf commit 5434609

File tree

2 files changed

+3
-35
lines changed

2 files changed

+3
-35
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"composer/installers": ">=1.0.1"
3030
},
3131
"require-dev": {
32-
"mediawiki/mediawiki-codesniffer": "~0.5"
32+
"wikibase/wikibase-codesniffer": "^0.1.0"
3333
},
3434
"autoload": {
3535
"files" : [
@@ -38,7 +38,7 @@
3838
},
3939
"scripts": {
4040
"phpcs": [
41-
"vendor/bin/phpcs lib/* src/* --standard=phpcs.xml -sp"
41+
"vendor/bin/phpcs . -sp"
4242
]
4343
}
4444
}

phpcs.xml

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,6 @@
11
<?xml version="1.0"?>
22
<ruleset name="DataValuesJavaScript">
3-
<!-- See https://github.com/wikimedia/mediawiki-tools-codesniffer/blob/master/MediaWiki/ruleset.xml -->
4-
<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
3+
<rule ref="vendor/wikibase/wikibase-codesniffer/Wikibase">
54
<exclude name="Generic.Arrays.DisallowLongArraySyntax" />
65
</rule>
7-
8-
<rule ref="Generic.ControlStructures" />
9-
<rule ref="Generic.Files.LineLength">
10-
<properties>
11-
<property name="lineLimit" value="124" />
12-
</properties>
13-
</rule>
14-
<rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" />
15-
16-
<rule ref="PSR1" />
17-
<rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
18-
<!-- Exclude test methods like "testGivenInvalidInput_methodThrowsException". -->
19-
<exclude-pattern>tests*Test*\.php</exclude-pattern>
20-
</rule>
21-
22-
<rule ref="PSR2.Files" />
23-
24-
<rule ref="Squiz.Classes.DuplicateProperty" />
25-
<rule ref="Squiz.Classes.SelfMemberReference" />
26-
<rule ref="Squiz.ControlStructures.ControlSignature" />
27-
<rule ref="Squiz.Functions.FunctionDuplicateArgument" />
28-
<rule ref="Squiz.Functions.GlobalFunction" />
29-
<rule ref="Squiz.Scope" />
30-
<rule ref="Squiz.WhiteSpace.FunctionSpacing">
31-
<properties>
32-
<property name="spacing" value="1" />
33-
</properties>
34-
</rule>
35-
36-
<arg name="extensions" value="php" />
37-
<arg name="ignore" value="*\.js" />
386
</ruleset>

0 commit comments

Comments
 (0)