upstream patch for 7.2

1 files changed, 62 insertions, 0 deletions

diff --git a/uopz-upstream.patch b/uopz-upstream.patch
index 35a29a7..fc956be 100644
--- a/uopz-upstream.patch
+++ b/uopz-upstream.patch
@@ -224,3 +224,65 @@ index 11b7f5f..98e9c37 100644
  		}
  	}
  
+From 90fb02322be03a3dec2f4e70db18b5626e8915c0 Mon Sep 17 00:00:00 2001
+From: Joe Watkins <krakjoe@php.net>
+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/src/copy.c b/src/copy.c
+index 889eada..a1c937c 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++;
+ 	}
+ 	
+From 9634704d803c9b85efa897599545cb5dac646146 Mon Sep 17 00:00:00 2001
+From: Joe Watkins <krakjoe@php.net>
+Date: Sun, 22 Jan 2017 19:20:22 +0000
+Subject: [PATCH] there is no zend_string_new here
+
+---
+ src/copy.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/copy.c b/src/copy.c
+index a1c937c..c8ca411 100644
+--- a/src/copy.c
++++ b/src/copy.c
+@@ -168,13 +168,13 @@ static inline zend_arg_info* uopz_copy_arginfo(zend_op_array *op_array, zend_arg
+ #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_string_copy(
+ 					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_new(old[it].class_name);
++			info[it].class_name = zend_string_copy(old[it].class_name);
+ #endif
+ 		it++;
+ 	}