Skip to content

Commit 72ce6a1

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Export zend_is_callable_at_frame
2 parents 8579f3d + 46b9e0c commit 72ce6a1

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Zend/zend_API.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3307,7 +3307,7 @@ ZEND_API zend_string *zend_get_callable_name(zval *callable) /* {{{ */
33073307
}
33083308
/* }}} */
33093309

3310-
static zend_always_inline zend_bool zend_is_callable_impl(
3310+
ZEND_API zend_bool zend_is_callable_at_frame(
33113311
zval *callable, zend_object *object, zend_execute_data *frame,
33123312
uint32_t check_flags, zend_fcall_info_cache *fcc, char **error) /* {{{ */
33133313
{
@@ -3436,7 +3436,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zend_object *object, uint
34363436
frame = frame->prev_execute_data;
34373437
}
34383438

3439-
zend_bool ret = zend_is_callable_impl(callable, object, frame, check_flags, fcc, error);
3439+
zend_bool ret = zend_is_callable_at_frame(callable, object, frame, check_flags, fcc, error);
34403440
if (callable_name) {
34413441
*callable_name = zend_get_callable_name_ex(callable, object);
34423442
}

Zend/zend_API.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,9 @@ ZEND_API ZEND_COLD void zend_wrong_param_count(void);
352352
ZEND_API void zend_release_fcall_info_cache(zend_fcall_info_cache *fcc);
353353
ZEND_API zend_string *zend_get_callable_name_ex(zval *callable, zend_object *object);
354354
ZEND_API zend_string *zend_get_callable_name(zval *callable);
355+
ZEND_API zend_bool zend_is_callable_at_frame(
356+
zval *callable, zend_object *object, zend_execute_data *frame,
357+
uint32_t check_flags, zend_fcall_info_cache *fcc, char **error);
355358
ZEND_API zend_bool zend_is_callable_ex(zval *callable, zend_object *object, uint32_t check_flags, zend_string **callable_name, zend_fcall_info_cache *fcc, char **error);
356359
ZEND_API zend_bool zend_is_callable(zval *callable, uint32_t check_flags, zend_string **callable_name);
357360
ZEND_API zend_bool zend_make_callable(zval *callable, zend_string **callable_name);

0 commit comments

Comments
 (0)