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

Author: jrfnl

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

@@ -141,7 +141,6 @@ protected function processMemberVar(File $phpcsFile, $stackPtr)
                 $error = 'Public member variable "%s" must not contain a leading underscore';
                 $data  = [$varName];
                 $phpcsFile->addError($error, $stackPtr, 'PublicHasUnderscore', $data);
-                return;
             }
         } else {
             if (substr($varName, 0, 1) !== '_') {
@@ -152,11 +151,13 @@ protected function processMemberVar(File $phpcsFile, $stackPtr)
                     $varName,
                 ];
                 $phpcsFile->addError($error, $stackPtr, 'PrivateNoUnderscore', $data);
-                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';
             $data  = [$varName];
             $phpcsFile->addError($error, $stackPtr, 'MemberVarNotCamelCaps', $data);