AbstractFunctionParameterSniff: fix first class callables and function imports

The `AbstractFunctionParameterSniff` class was incorrectly flagging first class callables and function imports as a function call without parameters. This commit fixes this behavior by introducing the `AbstractFunctionParameterSniff::is_targetted_token()` method. This method calls the parent method and then performs two additional checks to make sniffs extending this class ignore first class callables and function imports.

Since there are no tests for the abstract classes and the plan is to replace those classes with similar PHPCSUtils classes, I opted to add a few tests to the `I18nTextDomainFixer` tests that generate false positives before the changes implemented in this commit.

Author: rodrigoprimo

WordPress/AbstractFunctionParameterSniff.php

@@ -9,6 +9,7 @@
 
 namespace WordPressCS\WordPress;
 
+use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Utils\PassedParameters;
 use WordPressCS\WordPress\AbstractFunctionRestrictionsSniff;
 
@@ -77,6 +78,49 @@ public function process_matched_token( $stackPtr, $group_name, $matched_content
 		}
 	}
 
+	/**
+	 * Verify if the current token is a function call. Behaves like the parent method, except that
+	 * it also returns false if the function name is used in the context of a first class callable
+	 * or an import.
+	 *
+	 * @param int $stackPtr The position of the current token in the stack.
+	 *
+	 * @return bool
+	 */
+	public function is_targetted_token( $stackPtr ) {
+		$is_target_token = parent::is_targetted_token( $stackPtr );
+
+		if ( ! $is_target_token ) {
+			return false;
+		}
+
+		$ignore                   = Tokens::$emptyTokens;
+		$ignore[ \T_BITWISE_AND ] = \T_BITWISE_AND;
+		$prev                     = $this->phpcsFile->findPrevious( $ignore, ( $stackPtr - 1 ), null, true );
+		$next                     = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+
+		// Function import.
+		if ( ( \T_STRING === $this->tokens[ $prev ]['code'] && 'function' === $this->tokens[ $prev ]['content'] )
+			&& ( \T_AS === $this->tokens[ $next ]['code'] || \T_SEMICOLON === $this->tokens[ $next ]['code'] )
+		) {
+			return false;
+		}
+
+		$nextNonEmpty = $this->phpcsFile->findNext(
+			Tokens::$emptyTokens,
+			( $next + 1 ),
+			null,
+			true
+		);
+
+		// First class callable.
+		if ( \T_ELLIPSIS === $this->tokens[ $nextNonEmpty ]['code'] ) {
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 * Process the parameters of a matched function.
 	 *

WordPress/Tests/Utils/I18nTextDomainFixerUnitTest.7.inc

@@ -0,0 +1,15 @@
+<?php
+
+// phpcs:set WordPress.Utils.I18nTextDomainFixer old_text_domain
+// phpcs:set WordPress.Utils.I18nTextDomainFixer new_text_domain my-text-domain
+
+/*
+ * Test that AbstractFunctionParameterSniff does not treat first class callables and function
+ * imports as a function call without parameters. This test is added here as there are no dedicated
+ * tests for the WPCS abstract classes. The WPCS abstract classes will be replaced with PHPCSUtils
+ * similar classes in the future, so it is not worth creating dedicated tests at this point.
+ */
+
+use function __;
+use function __ as my_function;
+add_action('my_action', __(...));