Merge pull request #158 from photodude/patch-5

wilsonge · web-flow · commit 1677fa26f7f8 · 2017-02-19T18:16:02.000Z
Fixes for False positive for function names starting with triple underscore
diff --git a/Joomla/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/Joomla/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -45,7 +45,7 @@ protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $sta
 		$errorData = array($className . '::' . $methodName);
 
 		// Is this a magic method. i.e., is prefixed with "__" ?
-		if (preg_match('|^__|', $methodName) !== 0)
+		if (preg_match('|^__[^_]|', $methodName) !== 0)
 		{
 			$magicPart = strtolower(substr($methodName, 2));
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $sta`
`45`	`45`	`$errorData = array($className . '::' . $methodName);`
`46`	`46`
`47`	`47`	`// Is this a magic method. i.e., is prefixed with "__" ?`
`48`		`- if (preg_match('\|^__\|', $methodName) !== 0)`
	`48`	`+ if (preg_match('\|^__[^_]\|', $methodName) !== 0)`
`49`	`49`	`{`
`50`	`50`	`$magicPart = strtolower(substr($methodName, 2));`
`51`	`51`