From: Matthias Schmidt Date: Tue, 6 Mar 2018 17:08:06 +0000 (+0100) Subject: Remove sniff causing bogus error messages for now X-Git-Tag: 5.2.0_Alpha_1~802 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d47e5281b2f47b48c673c36b2dd912cc9588a670;p=GitHub%2FWoltLab%2FWCF.git Remove sniff causing bogus error messages for now See #2544 --- diff --git a/CodeSniff/WCF/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php b/CodeSniff/WCF/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php deleted file mode 100644 index abc922889a..0000000000 --- a/CodeSniff/WCF/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php +++ /dev/null @@ -1,110 +0,0 @@ - and Marc McIntyre - * and released under the terms of the BSD Licence. - * See: https://github.com/squizlabs/PHP_CodeSniffer/blob/master/CodeSniffer/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php - * - * @author Tim Duesterhus - * @license GNU Lesser General Public License - * @package WoltLabSuite\Core - */ -class OpeningFunctionBraceKernighanRitchieSniff implements Sniff { - /** - * Registers the tokens that this sniff wants to listen for. - * - * @return void - */ - public function register() { - return array(T_FUNCTION); - } - - /** - * Processes this test, when one of its tokens is encountered. - * - * @param PHP_CodeSniffer_File $phpcsFile The file being scanned. - * @param int $stackPtr The position of the current token in the - * stack passed in $tokens. - * - * @return void - */ - public function process(File $phpcsFile, $stackPtr) { - $tokens = $phpcsFile->getTokens(); - - if (isset($tokens[$stackPtr]['scope_opener']) === false) { - return; - } - - $openingBrace = $tokens[$stackPtr]['scope_opener']; - - $next = $phpcsFile->findNext(array(T_COMMENT, T_DOC_COMMENT, T_WHITESPACE), ($openingBrace + 1), null, true); - if ($tokens[$next]['line'] === $tokens[$openingBrace]['line']) { - // the closing brace is fine - if ($tokens[$openingBrace]['bracket_closer'] !== $next) { - $error = 'Opening brace must be the last content on the line'; - $fix = $phpcsFile->addFixableError($error, $openingBrace, 'ContentAfterBrace'); - if ($fix === true) { - $phpcsFile->fixer->addNewline($openingBrace); - } - } - } - - // The end of the function occurs at the end of the argument list. Its - // like this because some people like to break long function declarations - // over multiple lines. - $functionLine = $tokens[$tokens[$stackPtr]['parenthesis_closer']]['line']; - $braceLine = $tokens[$openingBrace]['line']; - - $lineDifference = ($braceLine - $functionLine); - - if ($lineDifference > 0) { - $error = 'Opening brace should be on the same line as the declaration'; - $phpcsFile->addError($error, $openingBrace, 'BraceOnNewLine'); - $phpcsFile->recordMetric($stackPtr, 'Function opening brace placement', 'new line'); - return; - } - - $closeBracket = $tokens[$stackPtr]['parenthesis_closer']; - if ($tokens[($closeBracket + 1)]['code'] !== T_WHITESPACE) { - $length = 0; - } - else if ($tokens[($closeBracket + 1)]['content'] === "\t") { - $length = '\t'; - } - else { - $length = strlen($tokens[($closeBracket + 1)]['content']); - } - - if ($length !== 1) { - $error = 'Expected 1 space after closing parenthesis; found %s'; - $data = array($length); - $phpcsFile->addError($error, $closeBracket, 'SpaceAfterBracket', $data); - return; - } - - $closeBrace = $tokens[$stackPtr]['scope_opener']; - if ($tokens[($closeBrace - 1)]['code'] !== T_WHITESPACE) { - $length = 0; - } - else if ($tokens[($closeBrace - 1)]['content'] === "\t") { - $length = '\t'; - } - else { - $length = strlen($tokens[($closeBrace - 1)]['content']); - } - - if ($length !== 1) { - $error = 'Expected 1 space before opening brace; found %s'; - $data = array($length); - $phpcsFile->addError($error, $openingBrace, 'SpaceBeforeBrace', $data); - return; - } - - $phpcsFile->recordMetric($stackPtr, 'Function opening brace placement', 'same line'); - } -}