Promote warnings to exceptions in ext/gettext, ext/sysvmsg and ext/xml #5926
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
force-pushed
the
warning-promo
branch
from
83dfe61 to
85a98d3
Compare
kocsismate
changed the title
kocsismate
force-pushed
the
warning-promo
branch
4 times, most recently
from
f8817aa to
26137e2
Compare
kocsismate
force-pushed
the
warning-promo
branch
from
26137e2 to
ce010dd
Compare
|
CI failure is not related to these changes (apparently, 05c5c93#r41138411 caused it) |
|
@nikic I believe these errors promotions should be safe to do. Can I merge this PR? |
nikic
approved these changes
Aug 3, 2020
| @@ -78,7 +78,7 @@ PHP_FUNCTION(textdomain) | |||
| RETURN_THROWS(); | |||
| } | |||
|
|
|||
| PHP_GETTEXT_DOMAIN_LENGTH_CHECK(domain_len) | |||
| PHP_GETTEXT_DOMAIN_LENGTH_CHECK(2, domain_len) | |||
There was a problem hiding this comment.
Suggested change
| PHP_GETTEXT_DOMAIN_LENGTH_CHECK(2, domain_len) | |
| PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, domain_len) |
| @@ -1029,8 +1029,8 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp | |||
| } else if (strcasecmp(encoding_param, "US-ASCII") == 0) { | |||
| encoding = (XML_Char*)"US-ASCII"; | |||
| } else { | |||
| php_error_docref(NULL, E_WARNING, "Unsupported source encoding \"%s\"", encoding_param); | |||
| RETURN_FALSE; | |||
| zend_argument_value_error(1, "is an unsupported source encoding"); | |||
There was a problem hiding this comment.
Suggested change
| zend_argument_value_error(1, "is an unsupported source encoding"); | |
| zend_argument_value_error(1, "is not a supported source encoding"); |
...maybe? This reads nicer to me, but your version is also ok.
| } | ||
| parser->target_encoding = enc->name; | ||
| break; | ||
| } | ||
| default: | ||
| php_error_docref(NULL, E_WARNING, "Unknown option"); | ||
| RETURN_FALSE; | ||
| zend_argument_value_error(2, "must be one of PHP_XML_OPTION_CASE_FOLDING, PHP_XML_OPTION_SKIP_TAGSTART, PHP_XML_OPTION_SKIP_WHITE, PHP_XML_OPTION_TARGET_ENCODING"); |
There was a problem hiding this comment.
Suggested change
| zend_argument_value_error(2, "must be one of PHP_XML_OPTION_CASE_FOLDING, PHP_XML_OPTION_SKIP_TAGSTART, PHP_XML_OPTION_SKIP_WHITE, PHP_XML_OPTION_TARGET_ENCODING"); | |
| zend_argument_value_error(2, "must be a PHP_XML_OPTION_* constant"); |
or similar. I think we should not list out all possible values in cases such as these.
There was a problem hiding this comment.
I like these suggestion so went with them!
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.
These warning promotions remove quite a few
falsereturn values.