Merge branch 'master' into limit_choices_selection_lite_part

Author: Crabcyborg

phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/PreferFrmAppHelperSniff.php

@@ -27,6 +27,7 @@ class PreferFrmAppHelperSniff implements Sniff {
 	private $methods = array(
 		'icon_by_class',
 		'unserialize_or_decode',
+		'tooltip_icon',
 	);
 
 	/**

phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/RedundantParenthesesSniff.php

@@ -33,6 +33,49 @@ public function register() {
 		return array( T_OPEN_PARENTHESIS );
 	}
 
+	/**
+	 * Detect parentheses that only wrap a simple comparison within a logical expression.
+	 *
+	 * Example: ( $start_year <= $year ) where the surrounding tokens are ||/&& or parentheses.
+	 *
+	 * @param File $phpcsFile  The file being scanned.
+	 * @param int  $openParen  Opening parenthesis token.
+	 * @param int  $closeParen Closing parenthesis token.
+	 * @param int  $prevToken  Token before the opening parenthesis.
+	 * @param int  $afterClose Token after the closing parenthesis.
+	 *
+	 * @return bool
+	 */
+	private function isRedundantComparisonInLogicalExpression( File $phpcsFile, $openParen, $closeParen, $prevToken, $afterClose ) {
+		$tokens = $phpcsFile->getTokens();
+
+		$validPreceding = array(
+			T_BOOLEAN_AND,
+			T_BOOLEAN_OR,
+			T_LOGICAL_AND,
+			T_LOGICAL_OR,
+			T_OPEN_PARENTHESIS,
+		);
+
+		if ( ! in_array( $tokens[ $prevToken ]['code'], $validPreceding, true ) ) {
+			return false;
+		}
+
+		$validFollowing = array(
+			T_BOOLEAN_AND,
+			T_BOOLEAN_OR,
+			T_LOGICAL_AND,
+			T_LOGICAL_OR,
+			T_CLOSE_PARENTHESIS,
+		);
+
+		if ( ! in_array( $tokens[ $afterClose ]['code'], $validFollowing, true ) ) {
+			return false;
+		}
+
+		return $this->isSimpleComparisonExpression( $phpcsFile, $openParen, $closeParen );
+	}
+
 	/**
 	 * Processes this test, when one of its tokens is encountered.
 	 *
@@ -72,6 +115,12 @@ public function process( File $phpcsFile, $stackPtr ) {
 			return;
 		}
 
+		// Check for redundant parentheses around a simple comparison inside a logical expression.
+		if ( $this->isRedundantComparisonInLogicalExpression( $phpcsFile, $stackPtr, $closeParen, $prevToken, $afterClose ) ) {
+			$this->reportAndFix( $phpcsFile, $stackPtr, $closeParen );
+			return;
+		}
+
 		// We only care about parentheses after an assignment operator, array arrow, or return.
 		$validPrecedingTokens = array(
 			T_EQUAL,
@@ -213,6 +262,24 @@ private function isSimpleComparisonExpression( File $phpcsFile, $openParen, $clo
 		$comparisonCount  = 0;
 		$logicalCount     = 0;
 		$nestedParenDepth = 0;
+		$arithmeticCount  = 0;
+
+		$comparisonTokens = array(
+			T_IS_EQUAL,
+			T_IS_NOT_EQUAL,
+			T_IS_IDENTICAL,
+			T_IS_NOT_IDENTICAL,
+			T_IS_SMALLER_OR_EQUAL,
+			T_IS_GREATER_OR_EQUAL,
+		);
+
+		$arithmeticTokens = array(
+			T_PLUS,
+			T_MINUS,
+			T_MULTIPLY,
+			T_DIVIDE,
+			T_MODULUS,
+		);
 
 		for ( $i = $openParen + 1; $i < $closeParen; $i++ ) {
 			$code = $tokens[ $i ]['code'];
@@ -233,18 +300,23 @@ private function isSimpleComparisonExpression( File $phpcsFile, $openParen, $clo
 			}
 
 			// Count comparison operators.
-			if ( in_array( $code, array( T_IS_EQUAL, T_IS_NOT_EQUAL, T_IS_IDENTICAL, T_IS_NOT_IDENTICAL ), true ) ) {
+			if ( in_array( $code, $comparisonTokens, true ) ) {
 				++$comparisonCount;
 			}
 
 			// Check for logical operators - if present, parentheses might be needed.
 			if ( in_array( $code, array( T_BOOLEAN_AND, T_BOOLEAN_OR, T_LOGICAL_AND, T_LOGICAL_OR ), true ) ) {
 				++$logicalCount;
 			}
+
+			// Arithmetic on either side means the grouping might be required.
+			if ( in_array( $code, $arithmeticTokens, true ) ) {
+				++$arithmeticCount;
+			}
 		}
 
 		// Simple comparison: exactly one comparison operator and no logical operators.
-		return 1 === $comparisonCount && 0 === $logicalCount;
+		return 1 === $comparisonCount && 0 === $logicalCount && 0 === $arithmeticCount;
 	}
 
 	/**

phpcs-sniffs/Formidable/ruleset.xml

@@ -48,7 +48,6 @@
 	<rule ref="Formidable.CodeAnalysis.PreferKsesEcho" />
 	<rule ref="Formidable.CodeAnalysis.PreferFrmAppHelper" />
 	<rule ref="Formidable.CodeAnalysis.InlineFrmSettingsReturn" />
-	<rule ref="Formidable.Commenting.AlignFilterParamTypesWithFunction" />
 	<rule ref="Formidable.CodeAnalysis.PreferPositiveTernaryCondition" />
 	<rule ref="Formidable.CodeAnalysis.StrictComparisonForIntFunctions" />
 	<rule ref="Formidable.CodeAnalysis.MoveSimpleCheckBeforeExpensiveCall" />
@@ -78,6 +77,7 @@
 	<rule ref="Formidable.Commenting.AddMissingParamType" />
 	<rule ref="Formidable.Commenting.AddMissingParamTypeFromDefault" />
 	<rule ref="Formidable.Commenting.AddMissingParamTypeFromCalls" />
+	<rule ref="Formidable.Commenting.AlignFilterParamTypesWithFunction" />
 
 	<!-- Security -->
 	<rule ref="Formidable.Security.AddDirectFileAccessCheck" />