Codecov Report

Patch coverage: 71.53% and project coverage change: +0.37% 🎉

Comparison is base (7ab5e96) 82.09% compared to head (a1c76c5) 82.46%.

@@             Coverage Diff              @@
##             master     #672      +/-   ##
============================================
+ Coverage     82.09%   82.46%   +0.37%     
- Complexity     3443     3460      +17     
============================================
  Files           154      154              
  Lines          9471     9491      +20     
============================================
+ Hits           7775     7827      +52     
+ Misses         1696     1664      -32     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kylekatarnls thanks, lets merge it once you approve it

We have coverage decreasing since those edge-cases are not covered by tests.

It would be nice to see if we can actually reproduce (if those are real edge-cases then we could have tests for them), or if they are only theoretical but cannot happen in practice, if so it would be better to handle with assert() rather than actual exceptions.

Yeah, I tried doing my best to deduce if they where possible or not and used assert() in that way. I currently do not have time to work on this, but I'm happy to review it if you have time to do so.

I hope I don't get carried too far away. I introduced some methods for repeated logic and split getUnexpectedTokenException because realizing it breaks the PSR, and has unexpected behavior when a null value is the value of the passed argument and not the default value because no argument passed.

And now when we need the next token but no possible end-of-file expected, then we can use requireNextToken() so TokenStreamEndException is taken care of, and the result is guaranteed to be a Token.

Oh and I forgot, I also replaced:

$tokenType = $this->tokenizer->peek();

if (...) {
    return ...
} elseif ($tokenType === Tokenizer::T_EOF) {
    throw new TokenStreamEndException($this->tokenizer);
}

throw $this->getUnexpectedNextTokenException();

With just:

$tokenType = $this->tokenizer->peek();

if (...) {
    return ...
}

throw $this->getUnexpectedNextTokenException();

Because TokenStreamEndException is already handled by getUnexpectedNextTokenException. This redundant pattern is actually not new.