Skip to content

Commit 40f0cd9

Browse files
thiemowmdethiemowmde
committed
Switch to the Wikibase CodeSniffer rule set
1 parent 01d3de9 commit 40f0cd9

8 files changed

Lines changed: 37 additions & 119 deletions

File tree

‎Aliases.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@
44
// It should not be included anywhere.
55
// Actual aliasing happens in the entry point using class_alias.
66

7-
namespace { throw new Exception( 'This code is not meant to be executed' ); }
7+
namespace {
8+
9+
throw new Exception( 'This code is not meant to be executed' );
10+
11+
}

‎composer.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"ockcyp/covers-validator": "~0.4.0",
3232
"phpmd/phpmd": "~2.3",
3333
"phpunit/phpunit": "~4.8",
34-
"squizlabs/php_codesniffer": "~2.3"
34+
"wikibase/wikibase-codesniffer": "^0.1.0"
3535
},
3636
"autoload": {
3737
"files" : [
@@ -58,8 +58,8 @@
5858
"scripts": {
5959
"test": [
6060
"@validate --no-interaction",
61-
"vendor/bin/phpunit",
62-
"vendor/bin/covers-validator"
61+
"phpunit",
62+
"covers-validator"
6363
],
6464
"cs": [
6565
"@phpcs",
@@ -70,10 +70,10 @@
7070
"@cs"
7171
],
7272
"phpcs": [
73-
"vendor/bin/phpcs src/* tests/* --standard=phpcs.xml --extensions=php -sp"
73+
"phpcs -p -s"
7474
],
7575
"phpmd": [
76-
"vendor/bin/phpmd src/ text phpmd.xml"
76+
"phpmd src/ text phpmd.xml"
7777
]
7878
}
7979
}

‎phpcs.xml‎

Lines changed: 20 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,23 @@
11
<?xml version="1.0"?>
2-
<!--
3-
- https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml
4-
- https://github.com/squizlabs/PHP_CodeSniffer/tree/master/CodeSniffer/Standards
5-
-->
62
<ruleset name="WikibaseDataModel">
7-
<rule ref="Generic.Arrays.DisallowLongArraySyntax" />
8-
9-
<rule ref="Generic.Classes" />
10-
<rule ref="Generic.ControlStructures" />
11-
12-
<rule ref="Generic.Files.ByteOrderMark" />
13-
<rule ref="Generic.Files.EndFileNewline" />
14-
<rule ref="Generic.Files.InlineHTML" />
15-
<rule ref="Generic.Files.LineEndings" />
16-
<rule ref="Generic.Files.LineLength">
17-
<properties>
18-
<property name="lineLimit" value="125" />
19-
<property name="absoluteLineLimit" value="125" />
20-
</properties>
21-
</rule>
22-
<rule ref="Generic.Files.OneClassPerFile" />
23-
<rule ref="Generic.Files.OneInterfacePerFile" />
24-
<rule ref="Generic.Files.OneTraitPerFile" />
25-
26-
<rule ref="Generic.Formatting.DisallowMultipleStatements" />
27-
28-
<rule ref="Generic.Functions.CallTimePassByReference" />
29-
<rule ref="Generic.Functions.FunctionCallArgumentSpacing" />
30-
<rule ref="Generic.Functions.OpeningFunctionBraceKernighanRitchie" />
31-
32-
<rule ref="Generic.Metrics.CyclomaticComplexity">
33-
<properties>
34-
<property name="complexity" value="10" />
35-
</properties>
36-
</rule>
37-
<rule ref="Generic.Metrics.NestingLevel">
38-
<properties>
39-
<property name="nestingLevel" value="3" />
40-
</properties>
41-
</rule>
42-
43-
<rule ref="Generic.NamingConventions" />
44-
<rule ref="Generic.NamingConventions.CamelCapsFunctionName.ScopeNotCamelCaps">
45-
<!-- Exclude test methods like "testGivenInvalidInput_methodThrowsException". -->
46-
<exclude-pattern>tests.unit*Test\.php</exclude-pattern>
47-
</rule>
48-
49-
<rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" />
50-
<rule ref="Generic.PHP.DeprecatedFunctions" />
51-
<rule ref="Generic.PHP.DisallowShortOpenTag" />
52-
<rule ref="Generic.PHP.ForbiddenFunctions" />
53-
<rule ref="Generic.PHP.LowerCaseConstant" />
54-
<rule ref="Generic.PHP.LowerCaseKeyword" />
55-
<rule ref="Generic.PHP.NoSilencedErrors" />
56-
<rule ref="Generic.PHP.SAPIUsage" />
57-
58-
<rule ref="Generic.WhiteSpace.DisallowSpaceIndent" />
59-
60-
<rule ref="PSR1" />
61-
<rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
62-
<!-- Exclude test methods like "testGivenInvalidInput_methodThrowsException". -->
63-
<exclude-pattern>tests.unit*Test\.php</exclude-pattern>
64-
</rule>
65-
66-
<rule ref="PSR2.Classes.PropertyDeclaration" />
67-
<rule ref="PSR2.ControlStructures.ElseIfDeclaration" />
68-
<rule ref="PSR2.Files" />
69-
<rule ref="PSR2.Namespaces" />
70-
71-
<rule ref="Squiz.Arrays.ArrayBracketSpacing" />
72-
<rule ref="Squiz.CSS.SemicolonSpacing" />
73-
<rule ref="Squiz.Classes.DuplicateProperty" />
74-
<rule ref="Squiz.Classes.SelfMemberReference" />
75-
<rule ref="Squiz.Classes.ValidClassName" />
76-
<rule ref="Squiz.Functions.FunctionDuplicateArgument" />
77-
<rule ref="Squiz.Functions.GlobalFunction" />
78-
<rule ref="Squiz.Scope" />
79-
80-
<rule ref="Squiz.Strings.DoubleQuoteUsage">
81-
<exclude name="Squiz.Strings.DoubleQuoteUsage.ContainsVar" />
82-
</rule>
83-
84-
<rule ref="Squiz.WhiteSpace.CastSpacing" />
85-
<rule ref="Squiz.WhiteSpace.LanguageConstructSpacing" />
86-
<rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing" />
87-
<rule ref="Squiz.WhiteSpace.FunctionSpacing">
88-
<properties>
89-
<property name="spacing" value="1" />
90-
</properties>
91-
</rule>
92-
<rule ref="Squiz.WhiteSpace.OperatorSpacing">
93-
<properties>
94-
<property name="ignoreNewlines" value="true" />
95-
</properties>
96-
</rule>
97-
<rule ref="Squiz.WhiteSpace.ScopeClosingBrace" />
98-
<rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing" />
99-
<rule ref="Squiz.WhiteSpace.SemicolonSpacing" />
100-
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" />
101-
102-
<rule ref="Zend.Files.ClosingTag" />
3+
<rule ref="vendor/wikibase/wikibase-codesniffer/Wikibase">
4+
<exclude name="PSR2.Methods.MethodDeclaration" />
5+
</rule>
6+
7+
<rule ref="Generic.Files.LineLength">
8+
<properties>
9+
<property name="lineLimit" value="120" />
10+
</properties>
11+
</rule>
12+
13+
<!-- Metrics are intentionally not part of the base Wikibase CodeSniffer rule set. -->
14+
<rule ref="Generic.Metrics.CyclomaticComplexity" />
15+
<rule ref="Generic.Metrics.NestingLevel" />
16+
17+
<rule ref="Generic.NamingConventions.CamelCapsFunctionName" />
18+
<rule ref="PSR1.Files.SideEffects" />
19+
<rule ref="Squiz.Arrays.ArrayBracketSpacing" />
20+
<rule ref="Squiz.Strings.DoubleQuoteUsage" />
21+
22+
<file>.</file>
10323
</ruleset>

‎src/HashArray.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ protected function preSetElement( $index, $hashable ) {
111111

112112
if ( $hasHash ) {
113113
return false;
114-
}
115-
else {
114+
} else {
116115
$this->offsetHashes[$hash] = $index;
117116

118117
return true;
@@ -203,9 +202,8 @@ public function getByElementHash( $elementHash ) {
203202
$offset = $this->offsetHashes[$elementHash];
204203
return $this->offsetGet( $offset );
205204
}
206-
else {
207-
return false;
208-
}
205+
206+
return false;
209207
}
210208

211209
/**

‎src/Term/AliasGroupList.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ public function removeByLanguage( $languageCode ) {
110110
public function setGroup( AliasGroup $group ) {
111111
if ( $group->isEmpty() ) {
112112
unset( $this->groups[$group->getLanguageCode()] );
113-
}
114-
else {
113+
} else {
115114
$this->groups[$group->getLanguageCode()] = $group;
116115
}
117116
}

‎src/Term/TermList.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@ public function hasTermForLanguage( $languageCode ) {
121121
public function setTerm( Term $term ) {
122122
if ( $term->getText() === '' ) {
123123
unset( $this->terms[$term->getLanguageCode()] );
124-
}
125-
else {
124+
} else {
126125
$this->terms[$term->getLanguageCode()] = $term;
127126
}
128127
}

‎tests/unit/HashArray/HashArrayWithoutDuplicatesTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ public function testRemoveElement( HashArray $array ) {
106106

107107
if ( $elementCount % 2 === 0 ) {
108108
$array->removeElement( $element );
109-
}
110-
else {
109+
} else {
111110
$array->removeByElementHash( $element->getHash() );
112111
}
113112

‎tests/unit/Snak/SnakListTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ public function testRemoveSnak( SnakList $array ) {
131131

132132
if ( $elementCount % 2 === 0 ) {
133133
$array->removeSnak( $element );
134-
}
135-
else {
134+
} else {
136135
$array->removeSnakHash( $element->getHash() );
137136
}
138137

0 commit comments

Comments
 (0)