Revert "Remove name field from the zend_constant struct (#10954)" #11604
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
iluuu1994
force-pushed
the
revert-f42992f
branch
2 times, most recently
from
82e2591 to
246d294
Compare
This reverts commit f42992f. Closes phpGH-11604
iluuu1994
force-pushed
the
revert-f42992f
branch
from
246d294 to
1a0ef2c
Compare
kocsismate
reviewed
Jul 17, 2023
| @@ -1500,7 +1500,12 @@ ZEND_FUNCTION(get_defined_constants) | |||
| } ZEND_HASH_FOREACH_END(); | |||
| module_names[i] = "user"; | |||
|
|
|||
| ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(EG(zend_constants), const_name, val) { | |||
| ZEND_HASH_MAP_FOREACH_PTR(EG(zend_constants), val) { | |||
| if (!val->name) { | |||
There was a problem hiding this comment.
IIRC even special constants have a name, so this condition (and the one below) are a no-op
There was a problem hiding this comment.
Probably, but let's fix that in a separate PR as this is a clean revert.
There was a problem hiding this comment.
Sure! So at last you didn't have to fix anything?
There was a problem hiding this comment.
No, I think there must've been a bug in gcc that was patched.
|
What was the motive for this reversion? |
dktapps
added a commit
to pmmp/ext-pmmpthread
that referenced
this pull request
Jul 24, 2023
This reverts commit 40a6626. The change related to this commit was reverted by php/php-src#11604.
|
@dktapps Fixing the BC break of lowercasing the constant name through reflection. See ext/zend_test/tests/gh11423.phpt. |
|
Thanks for explaining, that makes sense. #11423 is still open though. |
|
@dktapps Ah, good catch, thanks! |
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.
This reverts commit f42992f.