Hi, I like starting with a minimal approach so 👍 on that! I'll review it once I get to chance, if it's a cohesive set of changes please don't add anything to it meanwhile.

As for the test you can't figure out - for functions you need to require_once the file in gatherAssertTypes. That's why you've put the assert code in an anonymous function below so that's good.

Alternatively you can test classes + calling methods which thanks to autoloading doesn't require such workarounds. Don't forget to call composer dump-autoload once you add the class.

As for the test you can't figure out - for functions you need to require_once the file in gatherAssertTypes. That's why you've put the assert code in an anonymous function below so that's good.

That works, thank you!

Alternatively you can test classes + calling methods which thanks to autoloading doesn't require such workarounds. Don't forget to call composer dump-autoload once you add the class.

I'll need to do both since FuncCall and MethodCall are separate nodes...

It would be great if all the tests passed before I review this. Thank you.

But the general direction looks promising :)

Please use rebase instead of merge commits, I want to keep the history linear.

That should be green + no merge commits @ondrejmirtes.

Still to do:

• implement throw points for a lot of expression nodes, though some of the hardest ones (assignment and calls) are done already
• take into account throw points for expression nodes of statements (e.g. expr in if (expr) stmts)

I had to make some adjustments to the resolution of TryCatch to prevent regressions, I tried to keep the changes as small as possible (for this PR).

Nice! Looks like we're getting there, do you want me to add the test coverage for the nodes you implemented as well?

@rainbow-alex It's fine like this, I'm almost finished locally :)

@rainbow-alex This commit (e0182ce) is the main thing that was missing - the actual connection between throw points and specific catch blocks :)

Thank you!