Skip to content

Commit 8f12cdd

Browse files
committed
fix build
1 parent 0eda184 commit 8f12cdd

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

Zend/zend_execute.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,10 +1231,9 @@ static zend_always_inline bool zend_check_type(
12311231
}
12321232

12331233
ZEND_API bool zend_check_type_ex(
1234-
const zend_type *type, zval *arg, zend_class_entry *scope,
1235-
bool is_return_type, bool is_internal)
1234+
const zend_type *type, zval *arg, bool is_return_type, bool is_internal)
12361235
{
1237-
return zend_check_type(type, arg, scope, is_return_type, is_internal);
1236+
return zend_check_type(type, arg, is_return_type, is_internal);
12381237
}
12391238

12401239
ZEND_API bool zend_check_user_type_slow(

Zend/zend_execute.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ ZEND_API bool zend_verify_ref_array_assignable(zend_reference *ref);
111111
ZEND_API bool zend_check_user_type_slow(
112112
const zend_type *type, zval *arg, const zend_reference *ref, bool is_return_type);
113113
ZEND_API bool zend_check_type_ex(
114-
const zend_type *type, zval *arg, zend_class_entry *scope,
115-
bool is_return_type, bool is_internal);
114+
const zend_type *type, zval *arg, bool is_return_type, bool is_internal);
116115

117116
#if ZEND_DEBUG
118117
ZEND_API bool zend_internal_call_should_throw(const zend_function *fbc, zend_execute_data *call);

Zend/zend_partial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ static void zp_bind(zval *result, zend_function *function, uint32_t argc, zval *
10911091
arg_info = NULL;
10921092
}
10931093
if (arg_info && ZEND_TYPE_IS_SET(arg_info->type)
1094-
&& UNEXPECTED(!zend_check_type_ex(&arg_info->type, var, function->common.scope, 0, 0))) {
1094+
&& UNEXPECTED(!zend_check_type_ex(&arg_info->type, var, 0, 0))) {
10951095
zend_verify_arg_error(function, arg_info, offset+1, var);
10961096
zval_ptr_dtor(result);
10971097
ZVAL_NULL(result);

0 commit comments

Comments
 (0)