danog/phpdoc-parser
1
0
Fork 0
mirror of https://github.com/danog/phpdoc-parser.git synced 2024-11-26 20:15:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

ConstFetchNode - supports all constants wildcard

Browse Source
This commit is contained in:
Ondrej Mirtes 2020-04-30 19:11:49 +02:00
parent cfd8285ccc
commit fde6cca6d9
No known key found for this signature in database
GPG Key ID: 8E730BA25823D8B5
5 changed files with 80 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Parser/ConstExprParser.php
View File

@ -53,8 +53,18 @@ class ConstExprParser
}
if ($tokens->tryConsumeTokenType(Lexer::TOKEN_DOUBLE_COLON)) {
$classConstantName = $tokens->currentTokenValue();
$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
$classConstantName = '';
if ($tokens->currentTokenType() === Lexer::TOKEN_IDENTIFIER) {
$classConstantName .= $tokens->currentTokenValue();
$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
if ($tokens->tryConsumeTokenValue('*')) {
$classConstantName .= '*';
}
} else {
$tokens->consumeTokenValue('*');
$classConstantName .= '*';
}
return new Ast\ConstExpr\ConstFetchNode($identifier, $classConstantName);
}

35
src/Parser/ParserException.php
View File

@ -19,27 +19,43 @@ class ParserException extends \Exception
/** @var int */
private $expectedTokenType;
/** @var string */
private $expectedTokenValue;
public function __construct(
string $currentTokenValue,
int $currentTokenType,
int $currentOffset,
int $expectedTokenType
?int $expectedTokenType,
?string $expectedTokenValue = null
)
{
$this->currentTokenValue = $currentTokenValue;
$this->currentTokenType = $currentTokenType;
$this->currentOffset = $currentOffset;
$this->expectedTokenType = $expectedTokenType;
$this->expectedTokenValue = $expectedTokenValue;
$json = json_encode($currentTokenValue, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
assert($json !== false);
parent::__construct(sprintf(
'Unexpected token %s, expected %s at offset %d',
$json,
Lexer::TOKEN_LABELS[$expectedTokenType],
$currentOffset
));
if ($expectedTokenType !== null) {
parent::__construct(sprintf(
'Unexpected token %s, expected %s at offset %d',
$json,
Lexer::TOKEN_LABELS[$expectedTokenType],
$currentOffset
));
} elseif ($expectedTokenValue !== null) {
parent::__construct(sprintf(
'Unexpected token value %s, expected value %s at offset %d',
$json,
$expectedTokenValue,
$currentOffset
));
} else {
throw new \LogicException();
}
}
@ -66,4 +82,9 @@ class ParserException extends \Exception
return $this->expectedTokenType;
}
public function getExpectedTokenValue(): string
{
return $this->expectedTokenValue;
}
}

29
src/Parser/TokenIterator.php
View File

@ -69,6 +69,25 @@ class TokenIterator
return ($this->tokens[$this->index - 1][Lexer::TYPE_OFFSET] ?? -1) === Lexer::TOKEN_HORIZONTAL_WS;
}
/**
* @param string $tokenValue
* @throws \PHPStan\PhpDocParser\Parser\ParserException
*/
public function consumeTokenValue(string $tokenValue): void
{
if ($this->tokens[$this->index][Lexer::VALUE_OFFSET] !== $tokenValue) {
$this->throwError(null, $tokenValue);
}
$this->index++;
if (($this->tokens[$this->index][Lexer::TYPE_OFFSET] ?? -1) !== Lexer::TOKEN_HORIZONTAL_WS) {
return;
}
$this->index++;
}
/**
* @param int $tokenType
@ -77,7 +96,7 @@ class TokenIterator
public function consumeTokenType(int $tokenType): void
{
if ($this->tokens[$this->index][Lexer::TYPE_OFFSET] !== $tokenType) {
$this->throwError($tokenType);
$this->throwError($tokenType, null);
}
$this->index++;
@ -175,16 +194,18 @@ class TokenIterator
/**
* @param int $expectedTokenType
* @param int|null $expectedTokenType
* @param string|null $expectedTokenValue
* @throws \PHPStan\PhpDocParser\Parser\ParserException
*/
private function throwError(int $expectedTokenType): void
private function throwError(?int $expectedTokenType, ?string $expectedTokenValue): void
{
throw new \PHPStan\PhpDocParser\Parser\ParserException(
$this->currentTokenValue(),
$this->currentTokenType(),
$this->currentTokenOffset(),
$expectedTokenType
$expectedTokenType,
$expectedTokenValue
);
}

7
src/Parser/TypeParser.php
View File

@ -108,12 +108,7 @@ class TypeParser
if ($constExpr instanceof Ast\ConstExpr\ConstExprArrayNode) {
throw $exception;
}
if ($constExpr instanceof Ast\ConstExpr\ConstFetchNode) {
if ($tokens->currentTokenValue() === '*') {
$tokens->consumeTokenType($tokens->currentTokenType());
$constExpr = new Ast\ConstExpr\ConstFetchNode($constExpr->className, $constExpr->name . '*');
}
}
return new Ast\Type\ConstTypeNode($constExpr);
} catch (\LogicException $e) {
throw $exception;

14
tests/PHPStan/Parser/TypeParserTest.php
View File

@ -858,6 +858,20 @@ class TypeParserTest extends \PHPUnit\Framework\TestCase
'Foo::FOO_*',
new ConstTypeNode(new ConstFetchNode('Foo', 'FOO_*')),
],
[
'Foo::*',
new ConstTypeNode(new ConstFetchNode('Foo', '*')),
],
[
'Foo::**',
new \PHPStan\PhpDocParser\Parser\ParserException(
'**',
Lexer::TOKEN_END,
5,
null,
'*'
),
],
[
'( "foo" | Foo::FOO_* )',
new UnionTypeNode([