SlevomatCodingStandard.ControlStructures.DisallowYodaComparison: Fixed fixer

Author: kukulich

SlevomatCodingStandard/Helpers/YodaHelper.php

@@ -23,7 +23,6 @@
 use const T_BOOLEAN_AND;
 use const T_BOOLEAN_OR;
 use const T_CASE;
-use const T_CLOSE_CURLY_BRACKET;
 use const T_CLOSE_PARENTHESIS;
 use const T_CLOSE_SHORT_ARRAY;
 use const T_COALESCE;
@@ -343,7 +342,6 @@ private static function getStopTokenCodes(): array
 				T_COLON => true,
 				T_RETURN => true,
 				T_COMMA => true,
-				T_CLOSE_CURLY_BRACKET => true,
 				T_MATCH_ARROW => true,
 				T_FN_ARROW => true,
 			];

tests/Sniffs/ControlStructures/DisallowYodaComparisonSniffTest.php

@@ -22,7 +22,8 @@ public function testErrors(): void
 			self::assertSniffError($report, $lineNumber, DisallowYodaComparisonSniff::CODE_DISALLOWED_YODA_COMPARISON);
 		}
 
-		self::assertSniffError($report, 41, DisallowYodaComparisonSniff::CODE_DISALLOWED_YODA_COMPARISON);
+		self::assertSniffError($report, 39, DisallowYodaComparisonSniff::CODE_DISALLOWED_YODA_COMPARISON);
+		self::assertSniffError($report, 45, DisallowYodaComparisonSniff::CODE_DISALLOWED_YODA_COMPARISON);
 	}
 
 	public function testFixable(): void

tests/Sniffs/ControlStructures/RequireYodaComparisonSniffTest.php

@@ -21,7 +21,8 @@ public function testErrors(): void
 			self::assertSniffError($report, $lineNumber, RequireYodaComparisonSniff::CODE_REQUIRED_YODA_COMPARISON);
 		}
 
-		self::assertSniffError($report, 41, RequireYodaComparisonSniff::CODE_REQUIRED_YODA_COMPARISON);
+		self::assertSniffError($report, 39, RequireYodaComparisonSniff::CODE_REQUIRED_YODA_COMPARISON);
+		self::assertSniffError($report, 45, RequireYodaComparisonSniff::CODE_REQUIRED_YODA_COMPARISON);
 	}
 
 	public function testFixable(): void

tests/Sniffs/ControlStructures/data/disallowYodaComparisonErrors.php

@@ -36,6 +36,10 @@
 A::TYPE_A === $param xor $param === A::TYPE_B;
 $x = [$a, $b, $c] === $username;
 
+if (null === $row->{self::NAME}) {
+    return 0;
+}
+
 function ($condition, $actual) {
 	return match ($condition) {
 		'anything' => 1 === $actual,

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

@@ -70,6 +70,10 @@
 	// ...
 }
 
+if ($row->{self::NAME} === null) {
+    return 0;
+}
+
 function ($condition, $actual) {
 	return match ($condition) {
 		'anything' => $actual === 1,

tests/Sniffs/ControlStructures/data/fixableDisallowYodaComparisons.php

@@ -70,6 +70,10 @@
 	// ...
 }
 
+if (null === $row->{self::NAME}) {
+    return 0;
+}
+
 function ($condition, $actual) {
 	return match ($condition) {
 		'anything' => 1 === $actual,

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

@@ -67,6 +67,10 @@
 A::TYPE_A === $param or A::TYPE_B === $param;
 A::TYPE_A === $param xor A::TYPE_B === $param;
 
+if (null === $row->{self::NAME}) {
+    return 0;
+}
+
 function ($condition, $actual) {
 	return match ($condition) {
 		'anything' => 1 === $actual,

tests/Sniffs/ControlStructures/data/fixableRequireYodaComparisons.php

@@ -67,6 +67,10 @@
 A::TYPE_A === $param or $param === A::TYPE_B;
 $param === A::TYPE_A xor A::TYPE_B === $param;
 
+if ($row->{self::NAME} === null) {
+    return 0;
+}
+
 function ($condition, $actual) {
 	return match ($condition) {
 		'anything' => $actual === 1,

tests/Sniffs/ControlStructures/data/requireYodaComparisonErrors.php

@@ -36,6 +36,10 @@
 $param === A::TYPE_A xor A::TYPE_B === $param;
 $x = $username === [$a, $b, $c];
 
+if ($row->{self::NAME} === null) {
+    return 0;
+}
+
 function ($condition, $actual) {
 	return match ($condition) {
 		'anything' => $actual === 1,