Skip to content

Commit 61316e2

Browse files
HonzaCZkukulich
authored andcommitted
Fix (Disallow|Require)TrailingComma*Sniff to handle null parenthesis pointers
1 parent 39155a9 commit 61316e2

6 files changed

Lines changed: 14 additions & 6 deletions

SlevomatCodingStandard/Sniffs/Functions/DisallowTrailingCommaInCallSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function process(File $phpcsFile, int $parenthesisOpenerPointer): void
5353
$parenthesisCloserPointer = $tokens[$parenthesisOpenerPointer]['parenthesis_closer'];
5454
$pointerBeforeParenthesisCloser = TokenHelper::findPreviousEffective($phpcsFile, $parenthesisCloserPointer - 1);
5555

56-
if ($tokens[$pointerBeforeParenthesisCloser]['code'] !== T_COMMA) {
56+
if ($pointerBeforeParenthesisCloser === null || $tokens[$pointerBeforeParenthesisCloser]['code'] !== T_COMMA) {
5757
return;
5858
}
5959

SlevomatCodingStandard/Sniffs/Functions/DisallowTrailingCommaInClosureUseSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function process(File $phpcsFile, int $functionPointer): void
5050
$useParenthesisOpenerPointer,
5151
);
5252

53-
if ($tokens[$pointerBeforeUseParenthesisCloser]['code'] !== T_COMMA) {
53+
if ($pointerBeforeUseParenthesisCloser === null || $tokens[$pointerBeforeUseParenthesisCloser]['code'] !== T_COMMA) {
5454
return;
5555
}
5656

SlevomatCodingStandard/Sniffs/Functions/DisallowTrailingCommaInDeclarationSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function process(File $phpcsFile, int $functionPointer): void
3838
$parenthesisOpenerPointer,
3939
);
4040

41-
if ($tokens[$pointerBeforeParenthesisCloser]['code'] !== T_COMMA) {
41+
if ($pointerBeforeParenthesisCloser === null || $tokens[$pointerBeforeParenthesisCloser]['code'] !== T_COMMA) {
4242
return;
4343
}
4444

SlevomatCodingStandard/Sniffs/Functions/RequireTrailingCommaInCallSniff.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ public function process(File $phpcsFile, int $parenthesisOpenerPointer): void
6060

6161
$parenthesisCloserPointer = $tokens[$parenthesisOpenerPointer]['parenthesis_closer'];
6262

63-
if ($tokens[$parenthesisOpenerPointer]['line'] === $tokens[$parenthesisCloserPointer]['line']) {
63+
if ($parenthesisCloserPointer === null
64+
|| $tokens[$parenthesisOpenerPointer]['line'] === $tokens[$parenthesisCloserPointer]['line']
65+
) {
6466
return;
6567
}
6668

SlevomatCodingStandard/Sniffs/Functions/RequireTrailingCommaInClosureUseSniff.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ public function process(File $phpcsFile, int $functionPointer): void
4848
$useParenthesisOpenerPointer = $tokens[$usePointer]['parenthesis_opener'];
4949
$useParenthesisCloserPointer = $tokens[$usePointer]['parenthesis_closer'];
5050

51-
if ($tokens[$useParenthesisOpenerPointer]['line'] === $tokens[$useParenthesisCloserPointer]['line']) {
51+
if ($useParenthesisOpenerPointer === null
52+
|| $useParenthesisCloserPointer === null
53+
|| $tokens[$useParenthesisOpenerPointer]['line'] === $tokens[$useParenthesisCloserPointer]['line']
54+
) {
5255
return;
5356
}
5457

SlevomatCodingStandard/Sniffs/Functions/RequireTrailingCommaInDeclarationSniff.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ public function process(File $phpcsFile, int $functionPointer): void
3737
$parenthesisOpenerPointer = $tokens[$functionPointer]['parenthesis_opener'];
3838
$parenthesisCloserPointer = $tokens[$functionPointer]['parenthesis_closer'];
3939

40-
if ($tokens[$parenthesisOpenerPointer]['line'] === $tokens[$parenthesisCloserPointer]['line']) {
40+
if ($parenthesisOpenerPointer === null
41+
|| $parenthesisCloserPointer === null
42+
|| $tokens[$parenthesisOpenerPointer]['line'] === $tokens[$parenthesisCloserPointer]['line']
43+
) {
4144
return;
4245
}
4346

0 commit comments

Comments
 (0)