Added arrays to test cases

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

Hide file tree

Showing 5 changed files with 58 additions and 6 deletions.
diff --git a/src/Standards/Generic/Sniffs/ControlStructures/EnforceYodaConditionsSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/EnforceYodaConditionsSniff.php
@@ -45,7 +45,7 @@ public function process(File $phpcsFile, $stackPtr)
         if (in_array(
             $tokens[$nextIndex]['code'],
             [
-                T_CLOSE_SHORT_ARRAY,
+                T_OPEN_SHORT_ARRAY,
                 T_TRUE,
                 T_FALSE,
                 T_NULL,

diff --git a/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.inc b/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.inc
@@ -30,12 +30,33 @@ if($value == null){}
 if(null === $value){}
 if(null == $value){}
 
+if(
+    $value
+    ===
+    null
+){}
+if(
+    null
+    ===
+    $value
+){}
+
 // check string comparison
 if($value === 'string'){}
 if($value == 'string'){}
 if('string' === $value){}
 if('string' == $value){}
 
+if([] === $value){}
+if($value === [] ){}
+if([] == $value){}
+if($value == [] ){}
+
+if($value === array()){}
+if($value == array()){}
+if(array() === $value){}
+if(array() == $value){}
+
 // check string comparison
 $assigned = $value === 'string';
 $assigned = 'string' == $value;
diff --git a/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php b/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php
@@ -34,9 +34,14 @@ public function getErrorList()
             19 => 1,
             30 => 1,
             31 => 1,
-            36 => 1,
-            37 => 1,
-            41 => 1,
+            40 => 1,
+            47 => 1,
+            48 => 1,
+            50 => 1,
+            52 => 1,
+            57 => 1,
+            58 => 1,
+            62 => 1,
         ];
 
     }//end getErrorList()

diff --git a/src/Standards/Generic/Tests/ControlStructures/EnforceYodaConditionsUnitTest.inc b/src/Standards/Generic/Tests/ControlStructures/EnforceYodaConditionsUnitTest.inc
@@ -30,12 +30,33 @@ if($value == null){}
 if(null === $value){}
 if(null == $value){}
 
+if(
+    $value 
+    === 
+    null
+){}
+if(
+    null 
+    === 
+    $value
+){}
+
 // check string comparison
 if($value === 'string'){}
 if($value == 'string'){}
 if('string' === $value){}
 if('string' == $value){}
 
+if([] === $value){}
+if($value === [] ){}
+if([] == $value){}
+if($value == [] ){}
+
+if($value === array()){}
+if($value == array()){}
+if(array() === $value){}
+if(array() == $value){}
+
 // check string comparison
 $assigned = $value === 'string';
 $assigned = 'string' == $value;
diff --git a/src/Standards/Generic/Tests/ControlStructures/EnforceYodaConditionsUnitTest.php b/src/Standards/Generic/Tests/ControlStructures/EnforceYodaConditionsUnitTest.php
@@ -34,9 +34,14 @@ public function getErrorList()
             17 => 1,
             28 => 1,
             29 => 1,
-            34 => 1,
             35 => 1,
-            40 => 1,
+            45 => 1,
+            46 => 1,
+            51 => 1,
+            53 => 1,
+            55 => 1,
+            56 => 1,
+            61 => 1,
         ];
 
     }//end getErrorList()