From 90fb02322be03a3dec2f4e70db18b5626e8915c0 Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Fri, 20 Jan 2017 07:37:07 +0000 Subject: [PATCH] add 7.2 to travis, fix 7.2 build --- .travis.yml | 1 + src/copy.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fdd2ee1f..b3a25399 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: php php: - 7.0 + - 7.1 - nightly install: - sudo apt-get update diff --git a/src/copy.c b/src/copy.c index 889eadaa..a1c937cd 100644 --- a/src/copy.c +++ b/src/copy.c @@ -165,8 +165,17 @@ static inline zend_arg_info* uopz_copy_arginfo(zend_op_array *op_array, zend_arg while (it < end) { if (info[it].name) info[it].name = zend_string_copy(old[it].name); +#if PHP_VERSION_ID >= 70200 + if (ZEND_TYPE_IS_SET(old[it].type) && ZEND_TYPE_IS_CLASS(old[it].type)) { + info[it].type = ZEND_TYPE_ENCODE_CLASS( + zend_string_new( + ZEND_TYPE_NAME(info[it].type)), + ZEND_TYPE_ALLOW_NULL(info[it].type)); + } +#else if (info[it].class_name) - info[it].class_name = zend_string_copy(old[it].class_name); + info[it].class_name = zend_string_new(old[it].class_name); +#endif it++; }