Skip to content

[TASK] Drop unnecessary properties from UnexpectedTokenException #983

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

Merged
merged 1 commit into from
Feb 24, 2025
Merged

[TASK] Drop unnecessary properties from UnexpectedTokenException #983

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
26 changes: 4 additions & 22 deletions src/Parsing/UnexpectedTokenException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,38 +9,20 @@
*/
class UnexpectedTokenException extends SourceException
{
/**
* @var string
*/
private $expected;

/**
* @var string
*/
private $found;

/**
* @var 'literal'|'identifier'|'count'|'expression'|'search'|'custom'
*/
private $matchType;

/**
* @param 'literal'|'identifier'|'count'|'expression'|'search'|'custom' $matchType
* @param int<0, max> $lineNumber
*/
public function __construct(string $expected, string $found, string $matchType = 'literal', int $lineNumber = 0)
{
$this->expected = $expected;
$this->found = $found;
$this->matchType = $matchType;
$message = "Token “{$expected}” ({$matchType}) not found. Got “{$found}”.";
if ($this->matchType === 'search') {
if ($matchType === 'search') {
$message = "Search for “{$expected}” returned no results. Context: “{$found}”.";
} elseif ($this->matchType === 'count') {
} elseif ($matchType === 'count') {
$message = "Next token was expected to have {$expected} chars. Context: “{$found}”.";
} elseif ($this->matchType === 'identifier') {
} elseif ($matchType === 'identifier') {
$message = "Identifier expected. Got “{$found}”";
} elseif ($this->matchType === 'custom') {
} elseif ($matchType === 'custom') {
$message = \trim("$expected $found");
}

Expand Down