Fix #79212: NumberFormatter::format() may detect wrong type #5141
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
We have to convert to number *before* detecting the type, to cater to internal objects implementing `cast_object`. We also get rid of the fallback behavior of using `FORMAT_TYPE_INT32`, because that can no longer happen; after `convert_to_numer()` the type is either `IS_LONG` or `IS_DOUBLE`.
nikic
reviewed
Feb 2, 2020
Like the name implies, `convert_scalar_to_number_ex()` does not convert array. We enforce array to integer conversion right away, to avoid triggering the type confusion when `::TYPE_INT64` is passed as `$type`.
nikic
reviewed
Feb 3, 2020
| if(Z_TYPE_P(number) != IS_ARRAY) { | ||
| convert_scalar_to_number_ex(number); | ||
| } else { | ||
| convert_to_long(number); |
There was a problem hiding this comment.
I'd suggest treating this as an error condition instead.
There was a problem hiding this comment.
I don't think we can break BC here for PHP-7.3 and 7.4 (passing an array is currently supported, and the docs even implicitly support that: "Can be integer or float, other values will be converted to a numeric value."). I think changing this for master, would be prudent, though.
nikic
approved these changes
Feb 3, 2020
|
Thanks! Applied as c293549. I'll provide a PR for master ASAP. |
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.
We have to convert to number before detecting the type, to cater to
internal objects implementing
cast_object.We also get rid of the fallback behavior of using
FORMAT_TYPE_INT32,because that can no longer happen; after
convert_to_numer()the typeis either
IS_LONGorIS_DOUBLE.