SlevomatCodingStandard.ControlStructures.RequireYodaComparisonSniff/DisallowYodaComparison: Fixed false positives with match

Author: kukulich

SlevomatCodingStandard/Helpers/YodaHelper.php

@@ -43,6 +43,7 @@
 use const T_LOGICAL_AND;
 use const T_LOGICAL_OR;
 use const T_LOGICAL_XOR;
+use const T_MATCH_ARROW;
 use const T_MINUS;
 use const T_NS_SEPARATOR;
 use const T_NULL;
@@ -349,9 +350,11 @@ private static function getStopTokenCodes(): array
 				T_RETURN => true,
 				T_COMMA => true,
 				T_CLOSE_CURLY_BRACKET => true,
+				T_MATCH_ARROW => true,
 			];
 
 			$stopTokenCodes += array_fill_keys(array_keys(Tokens::$assignmentTokens), true);
+			$stopTokenCodes += array_fill_keys(array_keys(Tokens::$commentTokens), true);
 		}
 
 		return $stopTokenCodes;

tests/Sniffs/ControlStructures/DisallowYodaComparisonSniffTest.php

@@ -17,9 +17,12 @@ public function testNoErrors(): void
 	public function testErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/disallowYodaComparisonErrors.php');
+
 		foreach (range(3, 37) as $lineNumber) {
 			self::assertSniffError($report, $lineNumber, DisallowYodaComparisonSniff::CODE_DISALLOWED_YODA_COMPARISON);
 		}
+
+		self::assertSniffError($report, 41, DisallowYodaComparisonSniff::CODE_DISALLOWED_YODA_COMPARISON);
 	}
 
 	public function testFixable(): void

tests/Sniffs/ControlStructures/RequireYodaComparisonSniffTest.php

@@ -20,6 +20,8 @@ public function testErrors(): void
 		foreach (range(3, 37) as $lineNumber) {
 			self::assertSniffError($report, $lineNumber, RequireYodaComparisonSniff::CODE_REQUIRED_YODA_COMPARISON);
 		}
+
+		self::assertSniffError($report, 41, RequireYodaComparisonSniff::CODE_REQUIRED_YODA_COMPARISON);
 	}
 
 	public function testFixable(): void

tests/Sniffs/ControlStructures/data/disallowYodaComparisonErrors.php

@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 123 === $foo;
 true === $foo;
@@ -35,3 +35,10 @@
 $param === A::TYPE_A or A::TYPE_B === $param;
 A::TYPE_A === $param xor $param === A::TYPE_B;
 $x = [$a, $b, $c] === $username;
+
+function ($condition, $actual) {
+	return match ($condition) {
+		'anything' => 1 === $actual,
+		default => false,
+	};
+};

tests/Sniffs/ControlStructures/data/disallowYodaComparisonNoErrors.php

@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 $foo === $bar;
 $foo === 123;
@@ -72,3 +72,10 @@
 $param === A::TYPE_A and $param === A::TYPE_B;
 $param === A::TYPE_A or $param === A::TYPE_B;
 $param === A::TYPE_A xor $param === A::TYPE_B;
+
+function ($condition, $actual) {
+	return match ($condition) {
+		'anything' => $actual === 1,
+		default => false,
+	};
+};

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

@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 $foo === 123;
 $foo === true;
@@ -69,3 +69,10 @@
 if (null === $env = $parameters['env']) {
 	// ...
 }
+
+function ($condition, $actual) {
+	return match ($condition) {
+		'anything' => $actual === 1,
+		default => false,
+	};
+};

tests/Sniffs/ControlStructures/data/fixableDisallowYodaComparisons.php

@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 123 === $foo;
 true === $foo;
@@ -69,3 +69,10 @@
 if (null === $env = $parameters['env']) {
 	// ...
 }
+
+function ($condition, $actual) {
+	return match ($condition) {
+		'anything' => 1 === $actual,
+		default => false,
+	};
+};

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

@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 123 === $foo;
 true === $foo;
@@ -66,3 +66,10 @@
 A::TYPE_A === $param and A::TYPE_B === $param;
 A::TYPE_A === $param or A::TYPE_B === $param;
 A::TYPE_A === $param xor A::TYPE_B === $param;
+
+function ($condition, $actual) {
+	return match ($condition) {
+		'anything' => 1 === $actual,
+		default => false,
+	};
+};

tests/Sniffs/ControlStructures/data/fixableRequireYodaComparisons.php

@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 $foo === 123;
 $foo === true;
@@ -66,3 +66,10 @@
 $param === A::TYPE_A and $param === A::TYPE_B;
 A::TYPE_A === $param or $param === A::TYPE_B;
 $param === A::TYPE_A xor A::TYPE_B === $param;
+
+function ($condition, $actual) {
+	return match ($condition) {
+		'anything' => $actual === 1,
+		default => false,
+	};
+};

tests/Sniffs/ControlStructures/data/requireYodaComparisonErrors.php

@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.0
 
 $foo === 123;
 $foo === true;
@@ -35,3 +35,10 @@
 A::TYPE_A === $param or $param === A::TYPE_B;
 $param === A::TYPE_A xor A::TYPE_B === $param;
 $x = $username === [$a, $b, $c];
+
+function ($condition, $actual) {
+	return match ($condition) {
+		'anything' => $actual === 1,
+		default => false,
+	};
+};