com php-src: Add ZEND_ARG_CALLABLE_INFO to allow in ternal function to type hint against callable: Zend/zend_API.h
| From: | Xinchen Hui | Date: | Sun, 08 Mar 2015 15:00:13 +0000 |
| Subject: | com php-src: Add ZEND_ARG_CALLABLE_INFO to allow in ternal function to type hint against callable: Zend/zend_API.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85314@lists.php.net to get a copy of this message | ||
Commit: bb0504534df626e383727b2c881c8993767ec37e
Author: Rouven Weßling <me@rouvenwessling.de> Sun, 8 Mar 2015 22:55:23 +0800
Committer: Xinchen Hui <laruence@php.net> Sun, 8 Mar 2015 23:00:13 +0800
Parents: 1b0d32b350625b17ad1c5aa352eb7d2f87e03ce1
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bb0504534df626e383727b2c881c8993767ec37e
Log:
Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable
Changed paths:
M Zend/zend_API.h
Diff:
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 75d7ecd..39ea301 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -98,12 +98,13 @@ typedef struct _zend_fcall_info_cache {
#define ZEND_FE_END { NULL, NULL, NULL, 0, 0 }
-#define ZEND_ARG_INFO(pass_by_ref, name) { #name, NULL, 0, pass_by_ref, 0, 0 },
-#define ZEND_ARG_PASS_INFO(pass_by_ref) { NULL, NULL, 0, pass_by_ref, 0, 0 },
+#define ZEND_ARG_INFO(pass_by_ref, name) { #name, NULL, 0, pass_by_ref,
0, 0 },
+#define ZEND_ARG_PASS_INFO(pass_by_ref) { NULL, NULL, 0, pass_by_ref,
0, 0 },
#define ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) { #name, #classname,
IS_OBJECT, pass_by_ref, allow_null, 0 },
#define ZEND_ARG_ARRAY_INFO(pass_by_ref, name, allow_null) { #name, NULL, IS_ARRAY,
pass_by_ref, allow_null, 0 },
+#define ZEND_ARG_CALLABLE_INFO(pass_by_ref, name, allow_null) { #name, NULL, IS_CALLABLE,
pass_by_ref, allow_null, 0 },
#define ZEND_ARG_TYPE_INFO(pass_by_ref, name, type_hint, allow_null) { #name, NULL, type_hint,
pass_by_ref, allow_null, 0 },
-#define ZEND_ARG_VARIADIC_INFO(pass_by_ref, name) { #name, NULL, 0, pass_by_ref, 0, 1 },
+#define ZEND_ARG_VARIADIC_INFO(pass_by_ref, name) { #name, NULL, 0, pass_by_ref,
0, 1 },
#define ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type,
class_name, allow_null) \