SlevomatCodingStandard.Functions.RequireTrailingCommaInCall: Skip ins…

…tances on same line as closing parenthesis
slevomat · Dec 6, 2021 · b574727 · b574727
1 parent 4c6eee4
commit b574727
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/SlevomatCodingStandard/Sniffs/Functions/RequireTrailingCommaInCallSniff.php b/SlevomatCodingStandard/Sniffs/Functions/RequireTrailingCommaInCallSniff.php
@@ -79,7 +79,7 @@ public function process(File $phpcsFile, $parenthesisOpenerPointer): void
 			return;
 		}
 
-		if ($pointerBeforeParenthesisCloser + 1 === $parenthesisCloserPointer) {
+		if ($tokens[$parenthesisCloserPointer]['line'] === $tokens[$pointerBeforeParenthesisCloser]['line']) {
 			return;
 		}
 

diff --git a/tests/Sniffs/Functions/data/requireTrailingCommaInCallNoErrors.php b/tests/Sniffs/Functions/data/requireTrailingCommaInCallNoErrors.php
@@ -64,3 +64,10 @@ public function __construct(
 doSomething([
 	$a,
 ]);
+
+doSomething( $a,
+	$b );
+
+doSomething( doSomething(
+	$foo,
+) );
-Original file line number
+Diff line change
@@ Expand Up @@
     			return;
     		}
-    		if ($pointerBeforeParenthesisCloser + 1 === $parenthesisCloserPointer) {
+    		if ($tokens[$parenthesisCloserPointer]['line'] === $tokens[$pointerBeforeParenthesisCloser]['line']) {
     			return;
     		}
@@ Expand Down @@