Refactor implementation of DOM nodelists, named maps, and iterators #18892
+524
−440
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
- Use ecalloc() to not miss initializing any field. - Merge declarations and assignments.
nielsdos
commented
Jun 21, 2025
| @@ -22,7 +22,7 @@ foreach ($test_values as $value) { | |||
| ?> | |||
| --EXPECTF-- | |||
| --- -1 --- | |||
| string(1) "a" | |||
| string(3) "N/A" | |||
There was a problem hiding this comment.
The refactor actually fixed a bug here
There was a problem hiding this comment.
I would not backport this as this is a very invasive fix.
The code was really messy with lots of checks and inconsistencies. This splits everything up into different functions and now everything is relayed to a handler vtable.
Girgias
approved these changes
Jun 21, 2025
| } | ||
|
|
||
| void php_dom_named_node_map_get_named_item_into_zval(dom_nnodemap_object *objmap, const zend_string *named, zval *return_value) | ||
| void php_dom_named_node_map_get_named_item_into_zval(dom_nnodemap_object *objmap, const zend_string *named, const char *ns, zval *return_value) |
There was a problem hiding this comment.
Does it make sense as a follow-up refactoring to have the namespace be a zend_string instead of a char pointer? Got my answer does not make sense as this is just passed down to libxml.
| @@ -22,7 +22,7 @@ foreach ($test_values as $value) { | |||
| ?> | |||
| --EXPECTF-- | |||
| --- -1 --- | |||
| string(1) "a" | |||
| string(3) "N/A" | |||
There was a problem hiding this comment.
I would not backport this as this is a very invasive fix.
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.
See individual commits.
This is a prerequisite for the
$childrenproperty and for #18550I will follow up with a PR that moves some functions to the right files.