Skip to content

Commit 0e42098

Browse files
committed
Added more guard code for syntax errors. Further fix for #316.
1 parent 7aae771 commit 0e42098

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed

CodeSniffer/Standards/Generic/Sniffs/Functions/CallTimePassByReferenceSniff.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,18 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
9393
return;
9494
}
9595

96+
if (isset($tokens[$openBracket]['parenthesis_closer']) === false) {
97+
return;
98+
}
99+
96100
$closeBracket = $tokens[$openBracket]['parenthesis_closer'];
97101

98102
$nextSeparator = $openBracket;
99103
while (($nextSeparator = $phpcsFile->findNext(T_VARIABLE, ($nextSeparator + 1), $closeBracket)) !== false) {
104+
if (isset($tokens[$nextSeparator]['nested_parenthesis']) === false) {
105+
continue;
106+
}
107+
100108
// Make sure the variable belongs directly to this function call
101109
// and is not inside a nested function call or array.
102110
$brackets = $tokens[$nextSeparator]['nested_parenthesis'];

CodeSniffer/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
8080
$this->requiredSpacesBeforeClose = (int) $this->requiredSpacesBeforeClose;
8181
$tokens = $phpcsFile->getTokens();
8282

83-
if (isset($tokens[$stackPtr]['parenthesis_opener']) === true) {
83+
if (isset($tokens[$stackPtr]['parenthesis_opener']) === true
84+
&& isset($tokens[$stackPtr]['parenthesis_closer']) === true
85+
) {
8486
$parenOpener = $tokens[$stackPtr]['parenthesis_opener'];
8587
$parenCloser = $tokens[$stackPtr]['parenthesis_closer'];
8688
$spaceAfterOpen = 0;

CodeSniffer/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ public function processOpen(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
113113
public function processClose(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
114114
{
115115
$tokens = $phpcsFile->getTokens();
116+
if (isset($tokens[$stackPtr]['scope_closer']) === false) {
117+
return;
118+
}
116119

117120
$closeBrace = $tokens[$stackPtr]['scope_closer'];
118121
if ($tokens[($closeBrace - 1)]['code'] === T_WHITESPACE) {

CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
7575
{
7676
$tokens = $phpcsFile->getTokens();
7777

78-
if (isset($tokens[$stackPtr]['parenthesis_opener']) === true) {
78+
if (isset($tokens[$stackPtr]['parenthesis_opener']) === true
79+
&& isset($tokens[$stackPtr]['parenthesis_closer']) === true
80+
) {
7981
$parenOpener = $tokens[$stackPtr]['parenthesis_opener'];
8082
$parenCloser = $tokens[$stackPtr]['parenthesis_closer'];
8183
if ($tokens[($parenOpener + 1)]['code'] === T_WHITESPACE) {

0 commit comments

Comments
 (0)