Squiz/ValidVariableName: don't hide one message behind another

Fixes #1880

Author: jrfnl

src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php

@@ -139,17 +139,18 @@ protected function processMemberVar(File $phpcsFile, $stackPtr)
                     $errorData[0],
                 ];
                 $phpcsFile->addError($error, $stackPtr, 'PublicHasUnderscore', $data);
-                return;
             }
         } else {
             if (substr($varName, 0, 1) !== '_') {
                 $error = 'Private member variable "%s" must contain a leading underscore';
                 $phpcsFile->addError($error, $stackPtr, 'PrivateNoUnderscore', $errorData);
-                return;
             }
         }
 
-        if (Common::isCamelCaps($varName, false, $public, false) === false) {
+        // Remove a potential underscore prefix for testing CamelCaps.
+        $varName = ltrim($varName, '_');
+
+        if (Common::isCamelCaps($varName, false, true, false) === false) {
             $error = 'Member variable "%s" is not in valid camel caps format';
             $phpcsFile->addError($error, $stackPtr, 'MemberNotCamelCaps', $errorData);
         }

src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php

@@ -51,7 +51,7 @@ public function getErrorList()
             67  => 1,
             81  => 1,
             106 => 1,
-            107 => 1,
+            107 => 2,
             108 => 1,
             117 => 1,
         ];