Allowing underscored public methods in controllers. Fix #2

cakephp · Mar 17, 2012 · b3da292 · b3da292
1 parent 595e660
commit b3da292
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -128,6 +128,10 @@ protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $sta
 				$phpcsFile->addError($error, $stackPtr, 'PublicWithUnderscore', $errorData);
 				return;
 			}
+            // Underscored public methods in controller are allowed to break our rules.
+            if (substr($className, -10) === 'Controller') {
+                return;
+            }
 		} elseif ($isPrivate === true) {
             if (substr($methodName, 0, 2) !== '__') {
                 $error = 'Private method name "%s" must be prefixed with 2 underscores';