Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2

1 files changed, 9 insertions, 27 deletions

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index d2a6790d6b..4940457333 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -655,23 +655,13 @@ static void _class_string(string *str, zend_class_entry *ce, zval *obj, char *in
 /* {{{ _const_string */
 static void _const_string(string *str, char *name, zval *value, char *indent TSRMLS_DC)
 {
-	char *type;
-	zval value_copy;
-	int use_copy;
-
-	type = zend_zval_type_name(value);
-
-	zend_make_printable_zval(value, &value_copy, &use_copy);
-	if (use_copy) {
-		value = &value_copy;
-	}
+	char *type = zend_zval_type_name(value);
+	zend_string *value_str = zval_get_string(value);
 
 	string_printf(str, "%s    Constant [ %s %s ] { %s }\n",
-					indent, type, name, Z_STRVAL_P(value));
+					indent, type, name, value_str->val);
 
-	if (use_copy) {
-		zval_dtor(value);
-	}
+	STR_RELEASE(value_str);
 }
 /* }}} */
 
@@ -728,8 +718,7 @@ static void _parameter_string(string *str, zend_function *fptr, struct _zend_arg
 	if (fptr->type == ZEND_USER_FUNCTION && offset >= required) {
 		zend_op *precv = _get_recv_op((zend_op_array*)fptr, offset);
 		if (precv && precv->opcode == ZEND_RECV_INIT && precv->op2_type != IS_UNUSED) {
-			zval zv, zv_copy;
-			int use_copy;
+			zval zv;
 			string_write(str, " = ", sizeof(" = ")-1);
 			ZVAL_DUP(&zv, precv->op2.zv);
 			zval_update_constant_ex(&zv, (void*)1, fptr->common.scope TSRMLS_CC);
@@ -751,11 +740,9 @@ static void _parameter_string(string *str, zend_function *fptr, struct _zend_arg
 			} else if (Z_TYPE(zv) == IS_ARRAY) {
 				string_write(str, "Array", sizeof("Array")-1);
 			} else {
-				zend_make_printable_zval(&zv, &zv_copy, &use_copy);
-				string_write(str, Z_STRVAL(zv_copy), Z_STRLEN(zv_copy));
-				if (use_copy) {
-					zval_dtor(&zv_copy);
-				}
+				zend_string *zv_str = zval_get_string(&zv);
+				string_write(str, zv_str->val, zv_str->len);
+				STR_RELEASE(zv_str);
 			}
 			zval_ptr_dtor(&zv);
 		}
@@ -1529,7 +1516,7 @@ ZEND_METHOD(reflection, export)
 		ZVAL_COPY_VALUE(return_value, &retval);
 	} else {
 		/* No need for _r variant, return of __toString should always be a string */
-		zend_print_zval(&retval, 0);
+		zend_print_zval(&retval, 0 TSRMLS_CC);
 		zend_printf("\n");
 		zval_ptr_dtor(&retval);
 	}
@@ -4974,11 +4961,6 @@ ZEND_METHOD(reflection_property, getValue)
 		zend_unmangle_property_name(ref->prop.name->val, ref->prop.name->len, &class_name, &prop_name);
 		member_p = zend_read_property(ref->ce, object, prop_name, strlen(prop_name), 1 TSRMLS_CC);
 		ZVAL_DUP(return_value, member_p);
-//???
-		if (member_p != &EG(uninitialized_zval)) {
-			zval_add_ref(member_p);
-			zval_ptr_dtor(member_p);
-		}
 	}
 }
 /* }}} */