Commit aa22c2f

committed

fix issues found by phpstan

1 parent 0a3911f commit aa22c2fCopy full SHA for aa22c2f

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,15 +83,16 @@ class Lexer`
`83`	`83`
`84`	`84`	`public function tokenize(string $s): array`
`85`	`85`	`{`
`86`		`- if ($this->regexp === null) {`
	`86`	`+ if ($this->regexp === null \|\| $this->types === null) {`
`87`	`87`	`$this->initialize();`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ assert($this->regexp !== null);`
	`91`	`+ assert($this->types !== null);`
	`92`	`+`
`90`	`93`	`preg_match_all($this->regexp, $s, $tokens, PREG_SET_ORDER);`
`91`	`94`
`92`		`- assert($this->types !== null);`
`93`	`95`	`$count = count($this->types);`
`94`		`-`
`95`	`96`	`foreach ($tokens as &$match) {`
`96`	`97`	`for ($i = 1; $i <= $count; $i++) {`
`97`	`98`	`if ($match[$i] !== null && $match[$i] !== '') {`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,12 @@ public function __construct(`
`31`	`31`	`$this->currentOffset = $currentOffset;`
`32`	`32`	`$this->expectedTokenType = $expectedTokenType;`
`33`	`33`
	`34`	`+ $json = json_encode($currentTokenValue, JSON_UNESCAPED_UNICODE \| JSON_UNESCAPED_SLASHES);`
	`35`	`+ assert($json !== false);`
	`36`	`+`
`34`	`37`	`parent::__construct(sprintf(`
`35`	`38`	`'Unexpected token %s, expected %s at offset %d',`
`36`		`- json_encode($currentTokenValue, JSON_UNESCAPED_UNICODE \| JSON_UNESCAPED_SLASHES),`
	`39`	`+ $json,`
`37`	`40`	`Lexer::TOKEN_LABELS[$expectedTokenType],`
`38`	`41`	`$currentOffset`
`39`	`42`	`));`

Comments

(0)