Remove unnecessary error handler replacement in SPL #6955
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Document why it is needed in the remaining cases Drive-by refactoring
nikic
approved these changes
May 7, 2021
| @@ -500,7 +499,6 @@ static void spl_recursive_it_it_construct(INTERNAL_FUNCTION_PARAMETERS, zend_cla | |||
| RETURN_THROWS(); | |||
| } | |||
|
|
|||
| zend_replace_error_handling(EH_THROW, spl_ce_InvalidArgumentException, &error_handling); | |||
There was a problem hiding this comment.
getIterator() could warn -- but I agree that we shouldn't be promoting arbitrary warnings inside getIterator().
Comment on lines
+2061
to
+2065
| if (spl_filesystem_file_open(intern, use_include_path) == FAILURE) { | ||
| zend_restore_error_handling(&error_handling); | ||
| RETURN_THROWS(); | ||
| } | ||
| zend_restore_error_handling(&error_handling); |
There was a problem hiding this comment.
Suggested change
| if (spl_filesystem_file_open(intern, use_include_path) == FAILURE) { | |
| zend_restore_error_handling(&error_handling); | |
| RETURN_THROWS(); | |
| } | |
| zend_restore_error_handling(&error_handling); | |
| zend_result retval = spl_filesystem_file_open(intern, use_include_path); | |
| zend_restore_error_handling(&error_handling); | |
| if (retval == FAILURE) { | |
| RETURN_THROWS(); | |
| } |
How I'd personally write this.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Document why it is needed in the remaining cases
Drive-by refactoring
I think my changes are correct, but it is a bit of a call stack hell so i might have missed a reason why it is needed.