From: Andi Gutmans <andi@php.net>
Date: Mon, 1 Dec 2003 11:47:52 +0000 (+0000)
Subject: - Don't automatically call __toString() in convert_to_string_ex().
X-Git-Tag: php-5.0.0b3RC1~454
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a411d608fa55310105df7afd0e8d98f261188c6f;p=php

- Don't automatically call __toString() in convert_to_string_ex().
- use __toString() in your code.
- Keep the auto-case in make_printable_zval.
---

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 8a6f78e645..d26bee861e 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -492,6 +492,7 @@ ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC)
 			op->value.str.len = sizeof("Array")-1;
 			break;
 		case IS_OBJECT: {
+#if ANDI_0
 			TSRMLS_FETCH();
 			if (op->value.obj.handlers->cast_object) {
 				if (op->value.obj.handlers->cast_object(op, op, IS_STRING, 1 TSRMLS_CC) == SUCCESS) {
@@ -501,6 +502,7 @@ ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC)
 			} else {
 				zend_error(E_NOTICE, "Object of class %s to string conversion", Z_OBJCE_P(op)->name);
 			}
+#endif
 			zval_dtor(op);
 			op->value.str.val = estrndup_rel("Object", sizeof("Object")-1);
 			op->value.str.len = sizeof("Object")-1;