Functions/DynamicCalls: bug fix - ignore comments [2]

Skip over both whitespace, as well as comments and take live coding into account. This reduces false negatives, as well as fixing issue 590.

Includes unit tests.

Fixes 590

Author: jrfnl

WordPressVIPMinimum/Sniffs/Functions/DynamicCallsSniff.php

@@ -174,23 +174,15 @@ private function find_dynamic_calls() {
 		}
 
 		/*
-		 * Check if we have an '(' next, or separated by whitespaces from our current position.
+		 * Check if we have an '(' next.
 		 */
-
-		$i = 0;
-
-		do {
-			$i++;
-		} while ( $this->tokens[ $this->stackPtr + $i ]['type'] === 'T_WHITESPACE' );
-
-		if ( $this->tokens[ $this->stackPtr + $i ]['type'] !== 'T_OPEN_PARENTHESIS' ) {
+		$next = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $this->stackPtr + 1 ), null, true );
+		if ( $next === false || $this->tokens[ $next ]['code'] !== T_OPEN_PARENTHESIS ) {
 			return;
 		}
 
-		$t_item_key = $this->stackPtr + $i;
-
 		$message = 'Dynamic calling is not recommended in the case of %s.';
 		$data    = [ $this->variables_arr[ $this->tokens[ $this->stackPtr ]['content'] ] ];
-		$this->phpcsFile->addError( $message, $t_item_key, 'DynamicCalls', $data );
+		$this->phpcsFile->addError( $message, $this->stackPtr, 'DynamicCalls', $data );
 	}
 }

WordPressVIPMinimum/Tests/Functions/DynamicCallsUnitTest.inc

@@ -12,7 +12,7 @@ $my_okay_func = 'my_test';
 $my_okay_func(); // OK.
 
 $test_with_comment /*comment*/ = 'func_get_args';
-$test_with_comment(); // Bad.
+$test_with_comment /*comment*/ (); // Bad.
 
 $test_getting_the_actual_value_1 = function_call( 'extract' );
 $test_getting_the_actual_value_1(); // OK. Unclear what the actual variable value will be.
@@ -33,3 +33,6 @@ $ensure_no_notices_are_thrown_on_parse_error = /*comment*/ ;
 
 $test_double_quoted_string = "assert";
 $test_double_quoted_string(); // Bad.
+
+// Intentional parse error. This has to be the last test in the file.
+$my_notokay_func