Promote warnings to Error in FileInfo extension #5914
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
kocsismate
reviewed
Jul 31, 2020
ext/fileinfo/fileinfo.c
Outdated
| @@ -487,6 +485,9 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime | |||
|
|
|||
| default: | |||
| php_error_docref(NULL, E_WARNING, "Can only process string or stream arguments"); | |||
| // TODO Not sure I understand this code flow completely | |||
There was a problem hiding this comment.
I think this code path can't be reached since you added the type error
ext/fileinfo/fileinfo.c
Outdated
| @@ -376,8 +376,8 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime | |||
| break; | |||
|
|
|||
| default: | |||
| php_error_docref(NULL, E_WARNING, "Can only process string or stream arguments"); | |||
| RETURN_FALSE; | |||
| zend_argument_type_error(2, "must be of type string|resource, %s given", zend_zval_type_name(what)); | |||
There was a problem hiding this comment.
I think this message is good as-is, although probably the order of the types could be swapped. As far as I saw, object, array are both displayed before strings, so maybe it's worth to do the same with resources too.
Girgias
force-pushed
the
fileinfo-warning-to-error
branch
from
05d03fb to
0b54e61
Compare
|
CI Failure is unrelated |
nikic
approved these changes
Aug 6, 2020
71 tasks
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.
Not sure how we deal with resource types in union?
@kocsismate as the expert here on error messages, what do you recommend?