WIP work about yoda

squizlabs · Oct 15, 2018 · 058ffc7 · 058ffc7
1 parent 093ec1b
commit 058ffc7
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php
@@ -46,19 +46,20 @@ public function register()
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens    = $phpcsFile->getTokens();
-        $prevIndex = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        $prevIndex = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
         if (in_array(
             $tokens[$prevIndex]['code'],
             [
-                T_CLOSE_SHORT_ARRAY,
+                T_OPEN_SHORT_ARRAY,
+                T_ARRAY,
                 T_TRUE,
                 T_FALSE,
                 T_NULL,
                 T_LNUMBER,
                 T_CONSTANT_ENCAPSED_STRING,
             ],
             true
-        ) === false
+        ) === true
         ) {
             return;
         }

diff --git a/src/Standards/Generic/Sniffs/ControlStructures/EnforceYodaConditionsSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/EnforceYodaConditionsSniff.php
@@ -46,6 +46,7 @@ public function process(File $phpcsFile, $stackPtr)
             $tokens[$nextIndex]['code'],
             [
                 T_OPEN_SHORT_ARRAY,
+                T_ARRAY,
                 T_TRUE,
                 T_FALSE,
                 T_NULL,
@@ -58,23 +59,6 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        if ($tokens[$nextIndex]['code'] === T_CLOSE_SHORT_ARRAY) {
-            $nextIndex = $tokens[$nextIndex]['bracket_opener'];
-        }
-
-        $nextIndex = $phpcsFile->findNext(Tokens::$emptyTokens, ($nextIndex + 1), null, true);
-        if ($nextIndex === false) {
-            return;
-        }
-
-        if (in_array($tokens[$nextIndex]['code'], Tokens::$arithmeticTokens, true) === true) {
-            return;
-        }
-
-        if ($tokens[$nextIndex]['code'] === T_STRING_CONCAT) {
-            return;
-        }
-
         $phpcsFile->addError(
             'Use Yoda conditions. Switch the expression order.',
             $stackPtr,

diff --git a/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.inc b/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.inc
@@ -59,4 +59,9 @@ if(array() == $value){}
 
 // check string comparison
 $assigned = $value === 'string';
-$assigned = 'string' == $value;
+$assigned = 'string' == $value;
+
+if(($otherValue) === $value){}
+if($otherValue === ($value)){}
+if(($value) === true){}
+if((true) === $value){}
diff --git a/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php b/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php
@@ -32,6 +32,8 @@ public function getErrorList()
             13 => 1,
             18 => 1,
             19 => 1,
+            24 => 1,
+            25 => 1,
             30 => 1,
             31 => 1,
             40 => 1,

diff --git a/src/Standards/Generic/Tests/ControlStructures/EnforceYodaConditionsUnitTest.inc b/src/Standards/Generic/Tests/ControlStructures/EnforceYodaConditionsUnitTest.inc
@@ -59,4 +59,9 @@ if(array() == $value){}
 
 // check string comparison
 $assigned = $value === 'string';
-$assigned = 'string' == $value;
+$assigned = 'string' == $value;
+
+if(($otherValue) === $value){}
+if($otherValue === ($value)){}
+if(($value) === true){}
+if((true) === $value){}
diff --git a/src/Standards/Generic/Tests/ControlStructures/EnforceYodaConditionsUnitTest.php b/src/Standards/Generic/Tests/ControlStructures/EnforceYodaConditionsUnitTest.php
@@ -32,6 +32,8 @@ public function getErrorList()
             11 => 1,
             16 => 1,
             17 => 1,
+            22 => 1,
+            23 => 1,
             28 => 1,
             29 => 1,
             35 => 1,