Samwilson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/324376
Change subject: Return earlier when testing scope fields
......................................................................
Return earlier when testing scope fields
This rearranges when some fields of tokens are checked, to
avoid undefined index errors by returning earlier than was
the case.
Bug: T146439
Change-Id: I1be4e021e559b2a5efd1c1361a8b574e076e11dc
---
M MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
M MediaWiki/Sniffs/WhiteSpace/SpaceBeforeControlStructureBraceSniff.php
2 files changed, 12 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer
refs/changes/76/324376/1
diff --git a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
index f988be4..132f445 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -101,11 +101,11 @@
$tokens = $phpcsFile->getTokens();
// Skip constructor and destructor.
$methodName = $phpcsFile->getDeclarationName( $stackPtr );
- $endFunction = $tokens[$stackPtr]['scope_closer'];
// Return if no scope_opener.
if ( !isset( $tokens[$stackPtr]['scope_opener'] ) ) {
return;
}
+ $endFunction = $tokens[$stackPtr]['scope_closer'];
$returnToken = $phpcsFile->findNext( T_RETURN, $stackPtr + 1,
$endFunction );
// Return if the function has no return.
if ( $returnToken === false ) {
diff --git
a/MediaWiki/Sniffs/WhiteSpace/SpaceBeforeControlStructureBraceSniff.php
b/MediaWiki/Sniffs/WhiteSpace/SpaceBeforeControlStructureBraceSniff.php
index 834bb5e..0523c24 100644
--- a/MediaWiki/Sniffs/WhiteSpace/SpaceBeforeControlStructureBraceSniff.php
+++ b/MediaWiki/Sniffs/WhiteSpace/SpaceBeforeControlStructureBraceSniff.php
@@ -33,24 +33,25 @@
*/
public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
$tokens = $phpcsFile->getTokens();
- $closeBracket = $tokens[$stackPtr + 2]['parenthesis_closer'];
- $openBrace = $tokens[$stackPtr]['scope_opener'];
- $closeBracketLine = $tokens[$closeBracket]['line'];
- $openBraceLine = $tokens[$openBrace]['line'];
- $lineDifference = ( $openBraceLine - $closeBracketLine );
- if ( isset( $tokens[$stackPtr]['scope_opener'] ) == false ||
- $tokens[$stackPtr]['scope_opener'] === false ||
- $tokens[$openBrace]['content'] !== '{'
- ) {
+ if ( !isset( $tokens[$stackPtr]['scope_opener'] ) ||
+ $tokens[$stackPtr]['scope_opener'] === false ) {
return;
}
-
+ $openBrace = $tokens[$stackPtr]['scope_opener'];
+ if ( $tokens[$openBrace]['content'] !== '{' ) {
+ return;
+ }
if ( $tokens[$stackPtr + 1]['code'] !== T_WHITESPACE
|| $tokens[$stackPtr + 2]['code'] !== T_OPEN_PARENTHESIS
|| $tokens[$stackPtr + 2]['parenthesis_closer'] === null
) {
return;
}
+
+ $closeBracket = $tokens[$stackPtr + 2]['parenthesis_closer'];
+ $closeBracketLine = $tokens[$closeBracket]['line'];
+ $openBraceLine = $tokens[$openBrace]['line'];
+ $lineDifference = ( $openBraceLine - $closeBracketLine );
if ( $lineDifference > 0 ) {
// if brace on new line
$this->processLineDiff( $phpcsFile, $openBrace,
$closeBracket, $stackPtr );
--
To view, visit https://gerrit.wikimedia.org/r/324376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1be4e021e559b2a5efd1c1361a8b574e076e11dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Samwilson <s...@samwilson.id.au>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
