NoSilencedErrors: improve consistency metrics (#1843)

NoSilencedErrors: improve consistency metrics

Author: GaryJones

WordPress/Sniffs/PHP/NoSilencedErrorsSniff.php

@@ -179,22 +179,24 @@ public function process_token( $stackPtr ) {
 		$this->custom_whitelist = $this->merge_custom_array( $this->custom_whitelist, array(), false );
 		$this->custom_whitelist = array_map( 'strtolower', $this->custom_whitelist );
 
-		if ( true === $this->use_default_whitelist || ! empty( $this->custom_whitelist ) ) {
-			/*
-			 * Check if the error silencing is done for one of the whitelisted functions.
-			 */
-			$next_non_empty = $this->phpcsFile->findNext( $this->empty_tokens, ( $stackPtr + 1 ), null, true, null, true );
-			if ( false !== $next_non_empty && \T_STRING === $this->tokens[ $next_non_empty ]['code'] ) {
-				$has_parenthesis = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $next_non_empty + 1 ), null, true, null, true );
-				if ( false !== $has_parenthesis && \T_OPEN_PARENTHESIS === $this->tokens[ $has_parenthesis ]['code'] ) {
-					$function_name = strtolower( $this->tokens[ $next_non_empty ]['content'] );
-					if ( ( true === $this->use_default_whitelist
-						&& isset( $this->function_whitelist[ $function_name ] ) === true )
-						|| in_array( $function_name, $this->custom_whitelist, true ) === true
-					) {
-						$this->phpcsFile->recordMetric( $stackPtr, 'Error silencing', 'whitelisted function call: ' . $function_name );
-						return;
-					}
+		/*
+		 * Check if the error silencing is done for one of the whitelisted functions.
+		 *
+		 * @internal The function call name determination is done even when there is no whitelist active
+		 * to allow the metrics to be more informative.
+		 */
+		$next_non_empty = $this->phpcsFile->findNext( $this->empty_tokens, ( $stackPtr + 1 ), null, true, null, true );
+		if ( false !== $next_non_empty && \T_STRING === $this->tokens[ $next_non_empty ]['code'] ) {
+			$has_parenthesis = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $next_non_empty + 1 ), null, true, null, true );
+			if ( false !== $has_parenthesis && \T_OPEN_PARENTHESIS === $this->tokens[ $has_parenthesis ]['code'] ) {
+				$function_name = strtolower( $this->tokens[ $next_non_empty ]['content'] );
+				if ( ( true === $this->use_default_whitelist
+					&& isset( $this->function_whitelist[ $function_name ] ) === true )
+					|| ( ! empty( $this->custom_whitelist )
+					&& in_array( $function_name, $this->custom_whitelist, true ) === true )
+				) {
+					$this->phpcsFile->recordMetric( $stackPtr, 'Error silencing', 'whitelisted function call: ' . $function_name );
+					return;
 				}
 			}
 		}
@@ -228,7 +230,7 @@ public function process_token( $stackPtr ) {
 		);
 
 		if ( isset( $function_name ) ) {
-			$this->phpcsFile->recordMetric( $stackPtr, 'Error silencing', $function_name );
+			$this->phpcsFile->recordMetric( $stackPtr, 'Error silencing', '@' . $function_name );
 		} else {
 			$this->phpcsFile->recordMetric( $stackPtr, 'Error silencing', $found );
 		}