WIP work

squizlabs · Nov 12, 2018 · 82f63e0 · 82f63e0
1 parent db6b2bb
commit 82f63e0
Showing 1 changed file with 17 additions and 20 deletions.
diff --git a/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php
@@ -66,35 +66,32 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $skipTokens = array_merge(
-            [
-                T_CLOSE_PARENTHESIS => T_CLOSE_PARENTHESIS,
-                T_OPEN_PARENTHESIS  => T_OPEN_PARENTHESIS,
-            ],
-            Tokens::$emptyTokens
-        );
-
-        $previousIndex = $phpcsFile->findPrevious($skipTokens, ($stackPtr - 1), null, true);
-        if ($previousIndex === false) {
-            return;
-        }
-
-        if (in_array(
+        $previousIndex = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        if ($previousIndex === false || in_array(
             $tokens[$previousIndex]['code'],
             [
                 T_VARIABLE,
                 T_STRING,
             ],
             true
-        ) === false
+        ) === true
         ) {
-            $phpcsFile->addError(
-                'Usage of Yoda conditions is not allowed. Switch the expression order.',
-                $stackPtr,
-                'DisallowYodaCondition'
-            );
+            return;
+        }
+
+        if ($tokens[$previousIndex]['code'] === T_CLOSE_PARENTHESIS) {
+            $found = $phpcsFile->findPrevious([T_VARIABLE], ($previousIndex - 1), $tokens[$previousIndex]['parenthesis_opener']);
+            if ($found !== false) {
+                return;
+            }
         }
 
+        $phpcsFile->addError(
+            'Usage of Yoda conditions is not allowed. Switch the expression order.',
+            $stackPtr,
+            'DisallowYodaCondition'
+        );
+
     }//end process()