Skip to content

Commit 73f0b59

Browse files
committed
More sniffs.
1 parent 1586c3b commit 73f0b59

File tree

6 files changed

+23
-13
lines changed

6 files changed

+23
-13
lines changed

PhpCollective/Sniffs/Classes/MethodArgumentDefaultValueSniff.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,9 @@ protected function removeDefaultArgument(File $phpcsFile, int $startIndex, int $
147147
*/
148148
protected function isTypehintedNullableVariable(File $phpcsFile, int $index): bool
149149
{
150-
$tokens = $phpcsFile->getTokens();
151-
152-
$nextIndex = $phpcsFile->findNext(Tokens::$emptyTokens, $index + 1, null, true);
153-
154-
$nextToken = $tokens[$nextIndex];
150+
//$tokens = $phpcsFile->getTokens();
151+
//$nextIndex = $phpcsFile->findNext(Tokens::$emptyTokens, $index + 1, null, true);
152+
//$nextToken = $tokens[$nextIndex];
155153

156154
/*
157155
if (!$nextToken->equals([T_STRING, 'null'], false)) {

PhpCollective/Sniffs/Commenting/DocBlockTagIterableSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function process(File $phpcsFile, $stackPtr): void
4040

4141
$tag = $content;
4242
if (str_contains($tag, ' ')) {
43-
[$tag, $description] = explode(' ', $content, 2);
43+
[$tag] = explode(' ', $content, 2);
4444
}
4545

4646
if (!preg_match('#^@(?:[a-z]+-)?(?:param|return|var)\b#i', $tag)) {

PhpCollective/Sniffs/Commenting/DocCommentSniff.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,10 @@ public function process(File $phpcsFile, $stackPtr): void
128128

129129
// Account for the fact that a short description might cover
130130
// multiple lines.
131-
$shortContent = $tokens[$short]['content'];
132131
$shortEnd = $short;
133132
for ($i = ($short + 1); $i < $commentEnd; $i++) {
134133
if ($tokens[$i]['code'] === T_DOC_COMMENT_STRING) {
135134
if ($tokens[$i]['line'] === ($tokens[$shortEnd]['line'] + 1)) {
136-
$shortContent .= $tokens[$i]['content'];
137135
$shortEnd = $i;
138136
} else {
139137
break;

PhpCollective/Sniffs/PHP/ExitSniff.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ public function process(File $phpcsFile, $stackPtr): void
4848
*/
4949
protected function checkExitUsage(File $phpcsFile, int $stackPtr): void
5050
{
51-
$wrongTokens = [T_FUNCTION, T_OBJECT_OPERATOR, T_NEW, T_DOUBLE_COLON];
52-
51+
//$wrongTokens = [T_FUNCTION, T_OBJECT_OPERATOR, T_NEW, T_DOUBLE_COLON];
5352
$tokens = $phpcsFile->getTokens();
5453

5554
$tokenContent = $tokens[$stackPtr]['content'];

PhpCollective/ruleset.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
<rule ref="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue"/>
7272
<rule ref="SlevomatCodingStandard.TypeHints.LongTypeHints"/>
7373

74+
<rule ref="SlevomatCodingStandard.Attributes.AttributeAndTargetSpacing"/>
75+
<rule ref="SlevomatCodingStandard.Attributes.RequireAttributeAfterDocComment"/>
76+
7477
<rule ref="SlevomatCodingStandard.Classes.BackedEnumTypeSpacing"/>
7578
<rule ref="SlevomatCodingStandard.Classes.EnumCaseSpacing"/>
7679
<rule ref="SlevomatCodingStandard.Classes.ConstantSpacing">
@@ -90,6 +93,7 @@
9093
<rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
9194

9295
<rule ref="SlevomatCodingStandard.Variables.DuplicateAssignmentToVariable"/>
96+
<rule ref="SlevomatCodingStandard.Variables.UnusedVariable"/>
9397

9498
<rule ref="SlevomatCodingStandard.PHP.UselessSemicolon"/>
9599
<rule ref="SlevomatCodingStandard.PHP.ShortList"/>
@@ -114,6 +118,7 @@
114118
<rule ref="SlevomatCodingStandard.ControlStructures.DisallowContinueWithoutIntegerOperandInSwitch"/>
115119
<rule ref="SlevomatCodingStandard.ControlStructures.DisallowYodaComparison"/>
116120
<rule ref="SlevomatCodingStandard.ControlStructures.JumpStatementsSpacing"/>
121+
<rule ref="SlevomatCodingStandard.ControlStructures.LanguageConstructWithParentheses"/>
117122
<rule ref="SlevomatCodingStandard.PHP.ForbiddenClasses"/>
118123
<rule ref="SlevomatCodingStandard.Classes.ClassMemberSpacing"/>
119124

@@ -202,6 +207,7 @@
202207
<rule ref="Squiz.PHP.Eval"/>
203208
<rule ref="Generic.PHP.ForbiddenFunctions"/>
204209
<rule ref="Squiz.PHP.NonExecutableCode"/>
210+
<rule ref="Squiz.PHP.DisallowSizeFunctionsInLoops"/>
205211
<rule ref="Generic.PHP.NoSilencedErrors"/>
206212
<rule ref="Generic.PHP.LowerCaseConstant"/>
207213
<rule ref="SlevomatCodingStandard.PHP.TypeCast"/>

docs/sniffs.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# PhpCollective Code Sniffer
22

33

4-
The PhpCollectiveStrict standard contains 217 sniffs
4+
The PhpCollectiveStrict standard contains 226 sniffs
55

66
Generic (25 sniffs)
77
-------------------
@@ -165,12 +165,14 @@ PSR12 (14 sniffs)
165165
- PSR12.Properties.ConstantVisibility
166166
- PSR12.Traits.UseDeclaration
167167

168-
SlevomatCodingStandard (48 sniffs)
168+
SlevomatCodingStandard (56 sniffs)
169169
----------------------------------
170170
- SlevomatCodingStandard.Arrays.ArrayAccess
171171
- SlevomatCodingStandard.Arrays.MultiLineArrayEndBracketPlacement
172172
- SlevomatCodingStandard.Arrays.SingleLineArrayWhitespace
173173
- SlevomatCodingStandard.Arrays.TrailingArrayComma
174+
- SlevomatCodingStandard.Attributes.AttributeAndTargetSpacing
175+
- SlevomatCodingStandard.Attributes.RequireAttributeAfterDocComment
174176
- SlevomatCodingStandard.Classes.BackedEnumTypeSpacing
175177
- SlevomatCodingStandard.Classes.ClassConstantVisibility
176178
- SlevomatCodingStandard.Classes.ClassMemberSpacing
@@ -185,14 +187,19 @@ SlevomatCodingStandard (48 sniffs)
185187
- SlevomatCodingStandard.ControlStructures.DisallowContinueWithoutIntegerOperandInSwitch
186188
- SlevomatCodingStandard.ControlStructures.DisallowYodaComparison
187189
- SlevomatCodingStandard.ControlStructures.JumpStatementsSpacing
190+
- SlevomatCodingStandard.ControlStructures.LanguageConstructWithParentheses
188191
- SlevomatCodingStandard.ControlStructures.NewWithParentheses
189192
- SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator
190193
- SlevomatCodingStandard.ControlStructures.RequireShortTernaryOperator
191194
- SlevomatCodingStandard.Exceptions.DeadCatch
192195
- SlevomatCodingStandard.Functions.ArrowFunctionDeclaration
196+
- SlevomatCodingStandard.Functions.DisallowTrailingCommaInCall
197+
- SlevomatCodingStandard.Functions.DisallowTrailingCommaInClosureUse
198+
- SlevomatCodingStandard.Functions.DisallowTrailingCommaInDeclaration
193199
- SlevomatCodingStandard.Functions.NamedArgumentSpacing
194200
- SlevomatCodingStandard.Functions.RequireTrailingCommaInCall
195201
- SlevomatCodingStandard.Functions.RequireTrailingCommaInClosureUse
202+
- SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration
196203
- SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses
197204
- SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation
198205
- SlevomatCodingStandard.Namespaces.NamespaceDeclaration
@@ -214,9 +221,10 @@ SlevomatCodingStandard (48 sniffs)
214221
- SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing
215222
- SlevomatCodingStandard.TypeHints.UnionTypeHintFormat
216223
- SlevomatCodingStandard.Variables.DuplicateAssignmentToVariable
224+
- SlevomatCodingStandard.Variables.UnusedVariable
217225
- SlevomatCodingStandard.Whitespaces.DuplicateSpaces
218226

219-
Squiz (27 sniffs)
227+
Squiz (28 sniffs)
220228
-----------------
221229
- Squiz.Arrays.ArrayBracketSpacing
222230
- Squiz.Classes.LowercaseClassKeywords
@@ -231,6 +239,7 @@ Squiz (27 sniffs)
231239
- Squiz.Functions.LowercaseFunctionKeywords
232240
- Squiz.Functions.MultiLineFunctionDeclaration
233241
- Squiz.Operators.ValidLogicalOperators
242+
- Squiz.PHP.DisallowSizeFunctionsInLoops
234243
- Squiz.PHP.Eval
235244
- Squiz.PHP.NonExecutableCode
236245
- Squiz.Scope.MemberVarScope

0 commit comments

Comments
 (0)