Cleanup test

Author: simPod

tests/Sniffs/NamingConventions/ValidVariableNameSniffTest.php

@@ -25,43 +25,41 @@ public function testErrors(): void
             12 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
             15 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
             17 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
+            19 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
             20 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            22 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            24 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            25 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            26 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            31 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
-            33 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
-            36 => ValidVariableNameSniff::CODE_STRING_DOES_NOT_MATCH_PATTERN,
-            37 => ValidVariableNameSniff::CODE_STRING_DOES_NOT_MATCH_PATTERN,
-            39 => ValidVariableNameSniff::CODE_STRING_DOES_NOT_MATCH_PATTERN,
-            42 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
-            44 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
+            21 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
+            26 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
+            28 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
+            31 => ValidVariableNameSniff::CODE_STRING_DOES_NOT_MATCH_PATTERN,
+            32 => ValidVariableNameSniff::CODE_STRING_DOES_NOT_MATCH_PATTERN,
+            34 => ValidVariableNameSniff::CODE_STRING_DOES_NOT_MATCH_PATTERN,
+            37 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
+            39 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
+            48 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
+            50 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
             53 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
             55 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            58 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            60 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            62 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            63 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
-            64 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
-            67 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
-            81 => ValidVariableNameSniff::CODE_STRING_DOES_NOT_MATCH_PATTERN,
-            106 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            107 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            108 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            123 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            124 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            134 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            138 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
-            140 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
-            141 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
-            146 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            148 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
-            150 => [
+            57 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
+            58 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
+            59 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
+            62 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
+            76 => ValidVariableNameSniff::CODE_STRING_DOES_NOT_MATCH_PATTERN,
+            100 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
+            101 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
+            102 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
+            117 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
+            118 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
+            128 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
+            132 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
+            134 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
+            135 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
+            140 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
+            142 => ValidVariableNameSniff::CODE_MEMBER_DOES_NOT_MATCH_PATTERN,
+            144 => [
                 ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
                 ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
             ],
-            152 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
+            146 => ValidVariableNameSniff::CODE_DOES_NOT_MATCH_PATTERN,
         ];
         $possibleLines = array_keys($errorTypesPerLine);
 
@@ -79,6 +77,6 @@ public function testErrors(): void
             }
         }
 
-        self::assertSame(43, $file->getErrorCount());
+        self::assertSame(41, $file->getErrorCount());
     }
 }

tests/Sniffs/NamingConventions/data/ValidVariableNameSniffTest.inc

@@ -6,11 +6,6 @@ $_varName = 'hello';
 
 class MyClass
 {
-$varName  = 'hello';
-$var_name = 'hello';
-$varname  = 'hello';
-$_varName = 'hello';
-
     public $varName  = 'hello';
     public bool $var_name = false;
     public $varname  = 'hello';
@@ -80,7 +75,6 @@ $xmlParser = 'hello';
 
 echo "{$_SERVER['HOSTNAME']} $var_name";
 
-// Need to be the last thing in this test file.
 $obj->$classVar = $prefix.'-'.$type;
 
 class foo