Fixed bug #62328 (implementing __toString and a cast to string fails)

__toString should has a high priority

diff --git a/NEWS b/NEWS
index 60fe2b91fe3808ff0c0c2557a5a4ecaf69f30db6..6efc0dfcb2e213f7e0e3853a4b71d2eb50856b25 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 2012, PHP 5.4.7
 
 - Core:
+  . Fixed bug #62328 (implementing __toString and a cast to string fails)
+    (Laruence)
   . Fixed bug #62725 (Calling exit() in a shutdown function does not return
     the exit value). (Laruence)
   . Fixed bug #51363 (Fatal error raised by var_export() not caught by error 

diff --git a/Zend/zend.c b/Zend/zend.c
index 18c4f11604c9dc100476d6d690e828d8ebce41f7..09338e7f83436f18a4d4dfc798e8bfb46574c4c7 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -258,6 +258,9 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
                        {
                                TSRMLS_FETCH();
 
+                               if (zend_std_cast_object_tostring(expr, expr_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
+                                       break;
+                               }
                                if (Z_OBJ_HANDLER_P(expr, cast_object)) {
                                        zval *val;
 
@@ -270,12 +273,6 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
                                        }
                                        zval_ptr_dtor(&val);
                                }
-                               /* Standard PHP objects */
-                               if (Z_OBJ_HT_P(expr) == &std_object_handlers || !Z_OBJ_HANDLER_P(expr, cast_object)) {
-                                       if (zend_std_cast_object_tostring(expr, expr_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
-                                               break;
-                                       }
-                               }
                                if (!Z_OBJ_HANDLER_P(expr, cast_object) && Z_OBJ_HANDLER_P(expr, get)) {
                                        zval *z = Z_OBJ_HANDLER_P(expr, get)(expr TSRMLS_CC);
 

diff --git a/ext/xml/tests/bug62328.phpt b/ext/xml/tests/bug62328.phpt
new file mode 100644 (file)
index 0000000..e4c3c59
--- /dev/null
+++ b/ext/xml/tests/bug62328.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Bug #62328 (implementing __toString and a cast to string fails)
+--SKIPIF--
+<?php
+require_once("skipif.inc");
+?>
+--FILE--
+<?php
+class UberSimpleXML extends SimpleXMLElement {
+    public function __toString() {
+        return 'stringification';
+    }
+}
+
+$xml = new UberSimpleXML('<xml/>');
+
+var_dump((string) $xml);
+var_dump($xml->__toString());
+--EXPECT--
+string(15) "stringification"
+string(15) "stringification"