Skip to content

PHPC-2627: Use appropriate return type for zend_object_iterator_funcs.valid #1890

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 1 commit into from
Oct 15, 2025
Merged

PHPC-2627: Use appropriate return type for zend_object_iterator_funcs.valid #1890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BSON/Iterator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ static void php_phongo_iterator_it_dtor(zend_object_iterator* iter)
zval_ptr_dtor(&iter->data);
}

static int php_phongo_iterator_it_valid(zend_object_iterator* iter)
static PHONGO_ITERATOR_VALID_RESULT php_phongo_iterator_it_valid(zend_object_iterator* iter)
{
php_phongo_iterator_t* intern = Z_ITERATOR_OBJ_P(&iter->data);

Expand Down
7 changes: 7 additions & 0 deletions src/phongo_compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,4 +218,11 @@ const char* zend_get_object_type_case(const zend_class_entry* ce, zend_bool uppe
#define zend_get_object_type_uc(ce) zend_get_object_type_case((ce), true)
#endif /* PHP_VERSION_ID < 80200 */

/* zend_object_iterator_funcs.valid return type changed to zend_result in PHP 8.4 */
#if PHP_VERSION_ID < 80400
#define PHONGO_ITERATOR_VALID_RESULT int
#else
#define PHONGO_ITERATOR_VALID_RESULT zend_result
#endif

#endif /* PHONGO_COMPAT_H */