Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove $trimStrings from ConstExprParser #154

Draft
wants to merge 1 commit into
base: 1.9.x
Choose a base branch
from
Draft

Remove $trimStrings from ConstExprParser #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/Parser/ConstExprParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function __construct(bool $unescapeStrings = false)
$this->unescapeStrings = $unescapeStrings;
}

public function parse(TokenIterator $tokens, bool $trimStrings = false): Ast\ConstExpr\ConstExprNode
public function parse(TokenIterator $tokens): Ast\ConstExpr\ConstExprNode
{
if ($tokens->isCurrentTokenType(Lexer::TOKEN_FLOAT)) {
$value = $tokens->currentTokenValue();
Expand All @@ -49,12 +49,10 @@ public function parse(TokenIterator $tokens, bool $trimStrings = false): Ast\Con

if ($tokens->isCurrentTokenType(Lexer::TOKEN_SINGLE_QUOTED_STRING, Lexer::TOKEN_DOUBLE_QUOTED_STRING)) {
$value = $tokens->currentTokenValue();
if ($trimStrings) {
if ($this->unescapeStrings) {
$value = self::unescapeString($value);
} else {
$value = substr($value, 1, -1);
}
if ($this->unescapeStrings) {
$value = self::unescapeString($value);
} else {
$value = substr($value, 1, -1);
}
$tokens->next();
return new Ast\ConstExpr\ConstExprStringNode($value);
Expand Down
2 changes: 1 addition & 1 deletion src/Parser/TypeParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode
}

try {
$constExpr = $this->constExprParser->parse($tokens, true);
$constExpr = $this->constExprParser->parse($tokens);
if ($constExpr instanceof Ast\ConstExpr\ConstExprArrayNode) {
throw $exception;
}
Expand Down
64 changes: 14 additions & 50 deletions tests/PHPStan/Parser/ConstExprParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,22 +213,32 @@ public function provideStringNodeParseData(): Iterator
{
yield [
'"foo"',
new ConstExprStringNode('"foo"'),
new ConstExprStringNode('foo'),
];

yield [
'"Foo \\n\\"\\r Bar"',
new ConstExprStringNode('"Foo \\n\\"\\r Bar"'),
new ConstExprStringNode("Foo \n\"\r Bar"),
];

yield [
'\'bar\'',
new ConstExprStringNode('\'bar\''),
new ConstExprStringNode('bar'),
];

yield [
'\'Foo \\\' Bar\'',
new ConstExprStringNode('\'Foo \\\' Bar\''),
new ConstExprStringNode('Foo \' Bar'),
];

yield [
'"\u{1f601}"',
new ConstExprStringNode("\u{1f601}"),
];

yield [
'"\u{ffffffff}"',
new ConstExprStringNode("\u{fffd}"),
];
}

Expand Down Expand Up @@ -358,50 +368,4 @@ public function provideFetchNodeParseData(): Iterator
];
}

/**
* @dataProvider provideWithTrimStringsStringNodeParseData
*/
public function testParseWithTrimStrings(string $input, ConstExprNode $expectedExpr, int $nextTokenType = Lexer::TOKEN_END): void
{
$tokens = new TokenIterator($this->lexer->tokenize($input));
$exprNode = $this->constExprParser->parse($tokens, true);

$this->assertSame((string) $expectedExpr, (string) $exprNode);
$this->assertEquals($expectedExpr, $exprNode);
$this->assertSame($nextTokenType, $tokens->currentTokenType());
}

public function provideWithTrimStringsStringNodeParseData(): Iterator
{
yield [
'"foo"',
new ConstExprStringNode('foo'),
];

yield [
'"Foo \\n\\"\\r Bar"',
new ConstExprStringNode("Foo \n\"\r Bar"),
];

yield [
'\'bar\'',
new ConstExprStringNode('bar'),
];

yield [
'\'Foo \\\' Bar\'',
new ConstExprStringNode('Foo \' Bar'),
];

yield [
'"\u{1f601}"',
new ConstExprStringNode("\u{1f601}"),
];

yield [
'"\u{ffffffff}"',
new ConstExprStringNode("\u{fffd}"),
];
}

}