Generic/CamelCapsFunctionName: don't hide one message behind another

Author: jrfnl

src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php

@@ -110,14 +110,14 @@ protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScop
         // Is this a magic method. i.e., is prefixed with "__" ?
         if (preg_match('|^__[^_]|', $methodName) !== 0) {
             $magicPart = strtolower(substr($methodName, 2));
-            if (isset($this->magicMethods[$magicPart]) === false
-                && isset($this->methodsDoubleUnderscore[$magicPart]) === false
+            if (isset($this->magicMethods[$magicPart]) === true
+                || isset($this->methodsDoubleUnderscore[$magicPart]) === true
             ) {
-                $error = 'Method name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
-                $phpcsFile->addError($error, $stackPtr, 'MethodDoubleUnderscore', $errorData);
+                return;
             }
 
-            return;
+            $error = 'Method name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
+            $phpcsFile->addError($error, $stackPtr, 'MethodDoubleUnderscore', $errorData);
         }
 
         // PHP4 constructors are allowed to break our rules.
@@ -178,12 +178,12 @@ protected function processTokenOutsideScope(File $phpcsFile, $stackPtr)
         // Is this a magic function. i.e., it is prefixed with "__".
         if (preg_match('|^__[^_]|', $functionName) !== 0) {
             $magicPart = strtolower(substr($functionName, 2));
-            if (isset($this->magicFunctions[$magicPart]) === false) {
-                 $error = 'Function name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
-                 $phpcsFile->addError($error, $stackPtr, 'FunctionDoubleUnderscore', $errorData);
+            if (isset($this->magicFunctions[$magicPart]) === true) {
+                return;
             }
 
-            return;
+            $error = 'Function name "%s" is invalid; only PHP magic methods should be prefixed with a double underscore';
+            $phpcsFile->addError($error, $stackPtr, 'FunctionDoubleUnderscore', $errorData);
         }
 
         // Ignore first underscore in functions prefixed with "_".

src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php

@@ -40,7 +40,7 @@ public function getErrorList()
             31  => 1,
             50  => 1,
             52  => 1,
-            53  => 1,
+            53  => 2,
             57  => 1,
             58  => 1,
             59  => 1,
@@ -52,16 +52,16 @@ public function getErrorList()
             65  => 1,
             66  => 1,
             67  => 1,
-            68  => 1,
+            68  => 2,
             69  => 1,
             71  => 1,
             72  => 1,
-            73  => 1,
+            73  => 2,
             74  => 1,
             118 => 1,
             144 => 1,
             146 => 1,
-            147 => 1,
+            147 => 2,
         ];
 
         return $errors;