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.
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
Adds support for fixing missing throws doc block #7994
Conversation
Cool! That looks nice! If you target 4.x, you must keep compatibility with PHP 7.1 though. Can you check this and the other CI failure? Could you also add a test case with two different exceptions, to check the docblock rendering? |
'<?php | ||
/** | ||
* @throws InvalidArgumentException|DomainException | ||
* @throws Exception |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i preserve the existing throws annotation and add a new one based on inference
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So the fix will always add a new throws annotation which can have Exception1|Exception2
syntax, but not modify existing one
@@ -719,6 +725,8 @@ public function analyze( | |||
} | |||
|
|||
if (!$is_expected) { | |||
assert(class_exists($possibly_thrown_exception)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should i keep this assert or remove it, it makes sense for throws keyword to only contain classes which exist
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ideally this check would not be needed, but that means modifying the return type for the function getUncaughtThrows
which would be a bigger change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please drop it. It's risky because classes could be stubbed or inserted through a Plugin so you can't guarantee they'll exists for Psalm to autoload
['MissingThrowsDocblock'], | ||
true, | ||
], | ||
'doesNotAddDuplicateThrows' => [ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This validates that the fix only adds exceptions which are not listed in the current throws doc block
Seems fine to me, if you mark this as ready, I'm up to merge it :) |
@orklah Can this be merged or is it something to do still |
Sorry :( I didn't get a notification on the status change! Thanks! |
Fixes #7918