Skip to content

[pull] master from php:master #1157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 28, 2025
Merged

[pull] master from php:master #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b35b5e0
ext/lexbor: use PHP_VERSION for extension version (#20291)
DanielEScherzer Oct 28, 2025
c262045
Merge branch 'PHP-8.5'
DanielEScherzer Oct 28, 2025
336fbf0
[ci skip] Remove very outdated comment
ndossche Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Zend/zend_hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2851,7 +2851,6 @@ ZEND_API zend_result ZEND_FASTCALL zend_hash_move_backwards_ex(const HashTable *
}


/* This function should be made binary safe */
ZEND_API zend_hash_key_type ZEND_FASTCALL zend_hash_get_current_key_ex(const HashTable *ht, zend_string **str_index, zend_ulong *num_index, const HashPosition *pos)
{
uint32_t idx;
Expand Down
2 changes: 1 addition & 1 deletion ext/lexbor/php_lexbor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ zend_module_entry lexbor_module_entry = {
NULL, /* per-request startup function */
NULL, /* per-request shutdown function */
PHP_MINFO(lexbor), /* information function */
NULL,
PHP_VERSION,
STANDARD_MODULE_PROPERTIES
};

Expand Down