Promote warnings to exceptions in ext/simplexml #6011
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
71 tasks
nikic
reviewed
Aug 24, 2020
ext/simplexml/simplexml.c
Outdated
| @@ -400,7 +400,7 @@ static void change_node_zval(xmlNodePtr node, zval *value) | |||
| } | |||
| break; | |||
| default: | |||
| php_error_docref(NULL, E_WARNING, "It is not possible to assign complex types to nodes"); | |||
| zend_type_error("It's not possible to assign a complex type to nodes, %s given", zend_zval_type_name(value)); | |||
There was a problem hiding this comment.
Error condition seems to be untested.
There was a problem hiding this comment.
Uh, I couldn't trigger this error case in the newly added test :/
kocsismate
commented
Aug 24, 2020
kocsismate
force-pushed
the
simplexml-warning
branch
from
5f9e78f to
a80f41b
Compare
nikic
reviewed
Aug 25, 2020
kocsismate
force-pushed
the
simplexml-warning
branch
from
a80f41b to
644dba8
Compare
nikic
approved these changes
Aug 25, 2020
| @@ -411,7 +411,7 @@ static zval *sxe_prop_dim_write(zend_object *object, zval *member, zval *value, | |||
| * and could also be E_PARSE, but we use this only during parsing | |||
| * and this is during runtime. | |||
| */ | |||
| zend_throw_error(NULL, "Cannot create unnamed attribute"); | |||
| zend_throw_error(NULL, "Cannot append to an attribute list"); | |||
There was a problem hiding this comment.
I'd leave only the first line of the preceding comment.
|
|
kocsismate
commented
Aug 25, 2020
| * * &EG(error_zval), if an exception has been thrown. | ||
| * * NULL, if acquiring a direct pointer is not possible. | ||
| * In this case, the VM will fall back to using read_property and write_property. | ||
| */ |
There was a problem hiding this comment.
Thanks for the this explanation, it's really useful! Of course, I'm grateful for the fix, too :)
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.
No description provided.