Merge pull request #250 from TysonAndre/fix-php7.3.0alpha4

Fix notices seen in PHP 7.3.0alpha4 (but not alpha3)
This commit is contained in:
Rob Lourens 2018-07-22 19:40:41 -07:00 коммит произвёл GitHub
Родитель bce97ae2fc f3fcb1f637
Коммит 5123f9c190
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 8 добавлений и 8 удалений

Просмотреть файл

@ -1034,7 +1034,7 @@ class Parser {
$expression->children[] = $this->parseExpression($expression); $expression->children[] = $this->parseExpression($expression);
} }
$expression->children[] = $this->eat1(TokenKind::CloseBraceToken); $expression->children[] = $this->eat1(TokenKind::CloseBraceToken);
continue; break;
case $startQuoteKind = $expression->startQuote->kind: case $startQuoteKind = $expression->startQuote->kind:
case TokenKind::EndOfFileToken: case TokenKind::EndOfFileToken:
case TokenKind::HeredocEnd: case TokenKind::HeredocEnd:
@ -1042,11 +1042,11 @@ class Parser {
return $expression; return $expression;
case TokenKind::VariableName: case TokenKind::VariableName:
$expression->children[] = $this->parseTemplateStringExpression($expression); $expression->children[] = $this->parseTemplateStringExpression($expression);
continue; break;
default: default:
$expression->children[] = $this->getCurrentToken(); $expression->children[] = $this->getCurrentToken();
$this->advanceToken(); $this->advanceToken();
continue; break;
} }
} }
} }

Просмотреть файл

@ -86,11 +86,11 @@ class PhpTokenizer implements TokenStreamProviderInterface {
case T_OPEN_TAG: case T_OPEN_TAG:
$arr[] = new Token(TokenKind::ScriptSectionStartTag, $fullStart, $start, $pos-$fullStart); $arr[] = new Token(TokenKind::ScriptSectionStartTag, $fullStart, $start, $pos-$fullStart);
$start = $fullStart = $pos; $start = $fullStart = $pos;
continue; break;
case T_WHITESPACE: case T_WHITESPACE:
$start += $strlen; $start += $strlen;
continue; break;
case T_STRING: case T_STRING:
$name = \strtolower($token[1]); $name = \strtolower($token[1]);
@ -98,19 +98,19 @@ class PhpTokenizer implements TokenStreamProviderInterface {
$newTokenKind = TokenStringMaps::RESERVED_WORDS[$name]; $newTokenKind = TokenStringMaps::RESERVED_WORDS[$name];
$arr[] = new Token($newTokenKind, $fullStart, $start, $pos - $fullStart); $arr[] = new Token($newTokenKind, $fullStart, $start, $pos - $fullStart);
$start = $fullStart = $pos; $start = $fullStart = $pos;
continue; break;
} }
default: default:
if (($tokenKind === T_COMMENT || $tokenKind === T_DOC_COMMENT) && $treatCommentsAsTrivia) { if (($tokenKind === T_COMMENT || $tokenKind === T_DOC_COMMENT) && $treatCommentsAsTrivia) {
$start += $strlen; $start += $strlen;
continue; break;
} }
$newTokenKind = self::TOKEN_MAP[$tokenKind] ?? TokenKind::Unknown; $newTokenKind = self::TOKEN_MAP[$tokenKind] ?? TokenKind::Unknown;
$arr[] = new Token($newTokenKind, $fullStart, $start, $pos - $fullStart); $arr[] = new Token($newTokenKind, $fullStart, $start, $pos - $fullStart);
$start = $fullStart = $pos; $start = $fullStart = $pos;
continue; break;
} }
} }