Fix ForbiddenFunctionsSniff not counting arguments correctly

Array arguments use T_OPEN_SHORT_ARRAY, not T_OPEN_SQUARE_BRACKET. Bug: T341750 Change-Id: Ib844f3532ff70e010d1a065ebebbd2355f96d4be
wikimedia · Jul 12, 2023 · 59f6a9b · 59f6a9b
1 parent 482d9e5
commit 59f6a9b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php b/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
@@ -206,6 +206,7 @@ private function argCount( File $phpcsFile, int $parenthesis ): int {
 			$searchTokens = [
 				T_OPEN_CURLY_BRACKET,
 				T_OPEN_SQUARE_BRACKET,
+				T_OPEN_SHORT_ARRAY,
 				T_OPEN_PARENTHESIS,
 				T_COMMA
 			];
@@ -219,6 +220,12 @@ private function argCount( File $phpcsFile, int $parenthesis ): int {
 							$next = $tokens[$next]['parenthesis_closer'];
 						}
 						break;
+					case T_OPEN_SHORT_ARRAY:
+						if ( isset( $tokens[$next]['bracket_closer'] ) ) {
+							// jump to closing bracket to ignore commas between opener and closer
+							$next = $tokens[$next]['bracket_closer'];
+						}
+						break;
 					case T_COMMA:
 						$argCount++;
 						break;

diff --git a/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php b/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php
@@ -24,3 +24,4 @@
 define( 'ALLOWED', 42 );
 define( 'FORBIDDEN_CASE_SENSITIVE', 42, true );
 eval( '' );
+define( 'ARRAY_AS_SECOND_ARGUMENT_ALLOWED', [ 1, 2 ] );
diff --git a/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php.fixed b/MediaWiki/Tests/files/Usage/forbidden_functions_usage.php.fixed
@@ -24,3 +24,4 @@ $a = FooBar::sizeof['b'];
 define( 'ALLOWED', 42 );
 define( 'FORBIDDEN_CASE_SENSITIVE', 42, true );
 eval( '' );
+define( 'ARRAY_AS_SECOND_ARGUMENT_ALLOWED', [ 1, 2 ] );