Fixed YodaComparisonSniff for logical "and", "or" and "xor"

slevomat · Aug 23, 2017 · cb6986f · cb6986f
1 parent 4c41888
commit cb6986f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 1 deletion.
diff --git a/SlevomatCodingStandard/Sniffs/ControlStructures/YodaComparisonSniff.php b/SlevomatCodingStandard/Sniffs/ControlStructures/YodaComparisonSniff.php
@@ -77,6 +77,9 @@ private function getStopTokenCodes(): array
 				T_OPEN_TAG => true,
 				T_INLINE_THEN => true,
 				T_INLINE_ELSE => true,
+				T_LOGICAL_AND => true,
+				T_LOGICAL_OR => true,
+				T_LOGICAL_XOR => true,
 				T_COALESCE => true,
 				T_CASE => true,
 				T_COLON => true,

diff --git a/tests/Sniffs/ControlStructures/YodaComparisonSniffTest.php b/tests/Sniffs/ControlStructures/YodaComparisonSniffTest.php
@@ -14,7 +14,7 @@ public function testCorrectFile()
 	public function testIncorrectFile()
 	{
 		$resultFile = $this->checkFile(__DIR__ . '/data/allYodaComparisons.php');
-		foreach (range(3, 33) as $lineNumber) {
+		foreach (range(3, 36) as $lineNumber) {
 			$this->assertSniffError($resultFile, $lineNumber, YodaComparisonSniff::CODE_YODA_COMPARISON);
 		}
 	}

diff --git a/tests/Sniffs/ControlStructures/data/allYodaComparisons.php b/tests/Sniffs/ControlStructures/data/allYodaComparisons.php
@@ -31,3 +31,6 @@
 array(self::ADMIN_EMAIL === $username ? self::ROLE_ADMIN : self::ROLE_CUSTOMER);
 [[] === $array];
 [array() === $array];
+A::TYPE_A === $param and A::TYPE_B === $param;
+$param === A::TYPE_A or A::TYPE_B === $param;
+A::TYPE_A === $param xor $param === A::TYPE_B;
diff --git a/tests/Sniffs/ControlStructures/data/fixableYodaComparisons.fixed.php b/tests/Sniffs/ControlStructures/data/fixableYodaComparisons.fixed.php
@@ -60,3 +60,7 @@
 $x = array($username === [] ? true : false);
 $x = [$username === array() ? true : false];
 $x = [$username === [] ? true : false];
+
+$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;
diff --git a/tests/Sniffs/ControlStructures/data/fixableYodaComparisons.php b/tests/Sniffs/ControlStructures/data/fixableYodaComparisons.php
@@ -60,3 +60,7 @@
 $x = array([] === $username ? true : false);
 $x = [array() === $username ? true : false];
 $x = [[] === $username ? true : false];
+
+A::TYPE_A === $param and A::TYPE_B === $param;
+$param === A::TYPE_A or A::TYPE_B === $param;
+A::TYPE_A === $param xor $param === A::TYPE_B;
diff --git a/tests/Sniffs/ControlStructures/data/noYodaComparisons.php b/tests/Sniffs/ControlStructures/data/noYodaComparisons.php
@@ -67,3 +67,7 @@
 array($username === self::ADMIN_EMAIL ? self::ROLE_ADMIN : self::ROLE_CUSTOMER);
 [$array === []];
 [$array === array()];
+
+$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;