ConditionHelper: Fixed getNegativeCondition()

Author: kukulich

SlevomatCodingStandard/Helpers/ConditionHelper.php

@@ -113,12 +113,12 @@ private static function getNegativeConditionPart(File $phpcsFile, int $condition
 		$booleanPointers = TokenHelper::findNextAll($phpcsFile, Tokens::$booleanOperators, $conditionBoundaryStartPointer, $conditionBoundaryEndPointer + 1);
 
 		if ($tokens[$pointerAfterConditionStart]['code'] === T_BOOLEAN_NOT) {
-			if ($nested && count($booleanPointers) > 0) {
-				return self::removeBooleanNot($condition);
-			}
-
 			$pointerAfterBooleanNot = TokenHelper::findNextEffective($phpcsFile, $pointerAfterConditionStart + 1);
 			if ($tokens[$pointerAfterBooleanNot]['code'] === T_OPEN_PARENTHESIS) {
+				if ($nested && count($booleanPointers) > 0) {
+					return self::removeBooleanNot($condition);
+				}
+
 				$pointerAfterParenthesisCloser = TokenHelper::findNextEffective($phpcsFile, $tokens[$pointerAfterBooleanNot]['parenthesis_closer'] + 1, $conditionBoundaryEndPointer + 1);
 				if ($pointerAfterParenthesisCloser === null || $pointerAfterParenthesisCloser === $conditionBoundaryEndPointer) {
 					return TokenHelper::getContent($phpcsFile, $pointerAfterBooleanNot + 1, $tokens[$pointerAfterBooleanNot]['parenthesis_closer'] - 1);

tests/Sniffs/ControlStructures/UselessIfConditionWithReturnSniffTest.php

@@ -18,7 +18,7 @@ public function testErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/uselessIfConditionWithReturnErrors.php');
 
-		self::assertSame(8, $report->getErrorCount());
+		self::assertSame(9, $report->getErrorCount());
 
 		self::assertSniffError($report, 4, UselessIfConditionWithReturnSniff::CODE_USELESS_IF_CONDITION);
 		self::assertSniffError($report, 12, UselessIfConditionWithReturnSniff::CODE_USELESS_IF_CONDITION);
@@ -28,6 +28,7 @@ public function testErrors(): void
 		self::assertSniffError($report, 44, UselessIfConditionWithReturnSniff::CODE_USELESS_IF_CONDITION);
 		self::assertSniffError($report, 52, UselessIfConditionWithReturnSniff::CODE_USELESS_IF_CONDITION);
 		self::assertSniffError($report, 61, UselessIfConditionWithReturnSniff::CODE_USELESS_IF_CONDITION);
+		self::assertSniffError($report, 70, UselessIfConditionWithReturnSniff::CODE_USELESS_IF_CONDITION);
 
 		self::assertAllFixedInFile($report);
 	}

tests/Sniffs/ControlStructures/data/uselessIfConditionWithReturnErrors.fixed.php

@@ -41,3 +41,11 @@ function () {
 		return false;
 	}
 };
+
+function () {
+	return (
+		!empty($day['from']) || empty($day['to'])
+	) && (
+		empty($day['from']) || !empty($day['to'])
+	);
+};

tests/Sniffs/ControlStructures/data/uselessIfConditionWithReturnErrors.php

@@ -65,3 +65,15 @@ function () {
 		return false;
 	}
 };
+
+function () {
+	if ((
+		empty($day['from']) && !empty($day['to'])
+	) || (
+		!empty($day['from']) && empty($day['to'])
+	)) {
+		return false;
+	}
+
+	return true;
+};