blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codesniffer FHComplete rules: underscores before protected and private methods are not checked anymore

Browse Source
This commit is contained in:
Paolo
2017-08-21 12:22:56 +02:00
parent 0317c5314a
commit 17acfa3945
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+19 -18
View File
@@ -104,25 +104,26 @@ class FHComplete_Sniffs_NamingConventions_ValidFunctionNameSniff extends PHP_Cod
if (substr($className, -4) === 'Task') {
return;
}
} elseif ($isPrivate === true) {
if (substr($methodName, 0, 2) !== '__') {
$error = 'Private method name "%s" must be prefixed with 2 underscores';
$phpcsFile->addError($error, $stackPtr, 'PrivateNoUnderscore', $errorData);
return;
} else {
$filename = $phpcsFile->getFilename();
if (strpos($filename, '/lib/Cake/') === true) {
$warning = 'Private method name "%s" in FHComplete core is discouraged';
$phpcsFile->addWarning($warning, $stackPtr, 'PrivateMethodInCore', $errorData);
}
}
} else {
if ($methodName[0] !== '_' || substr($methodName, 0, 2) === '__') {
$error = 'Protected method name "%s" must be prefixed with one underscore';
$phpcsFile->addError($error, $stackPtr, 'ProtectedNoUnderscore', $errorData);
return;
}
}
//elseif ($isPrivate === true) {
// if (substr($methodName, 0, 2) !== '__') {
// $error = 'Private method name "%s" must be prefixed with 2 underscores';
// $phpcsFile->addError($error, $stackPtr, 'PrivateNoUnderscore', $errorData);
// return;
// } else {
// $filename = $phpcsFile->getFilename();
// if (strpos($filename, '/lib/Cake/') === true) {
// $warning = 'Private method name "%s" in FHComplete core is discouraged';
// $phpcsFile->addWarning($warning, $stackPtr, 'PrivateMethodInCore', $errorData);
// }
// }
//} else {
// if ($methodName[0] !== '_' || substr($methodName, 0, 2) === '__') {
// $error = 'Protected method name "%s" must be prefixed with one underscore';
// $phpcsFile->addError($error, $stackPtr, 'ProtectedNoUnderscore', $errorData);
// return;
// }
//}
}
/**