diff options
| author | Xinchen Hui <laruence@php.net> | 2012-08-12 10:40:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-08-12 10:40:41 +0800 |
| commit | d11fa44d626809f1160cafdaddd73d4c45516a2c (patch) | |
| tree | 55f1fccfd6528499e7c8833fcdfdb0548b1ea60a | |
| parent | 66a6d1b97b682a37e0d1f2654d7dcbe2eabbbcc7 (diff) | |
| parent | 222ab9da1aa086a47279d29c16a8ebea514257fe (diff) | |
| download | php-git-d11fa44d626809f1160cafdaddd73d4c45516a2c.tar.gz | |
Merge branch 'Bug-62328' of https://github.com/leight/php-src
| -rw-r--r-- | Zend/tests/bug62328.phpt | 22 | ||||
| -rw-r--r-- | Zend/zend.c | 6 |
2 files changed, 28 insertions, 0 deletions
diff --git a/Zend/tests/bug62328.phpt b/Zend/tests/bug62328.phpt new file mode 100644 index 0000000000..c56ddc2c69 --- /dev/null +++ b/Zend/tests/bug62328.phpt @@ -0,0 +1,22 @@ +--TEST-- +Bug #62328 (cast_object takes precedence over __toString) +--FILE-- +<?php + +class SplFileInfo62328 extends SplFileInfo +{ + public function __toString() + { + return '__toString'; + } +} + +$fi = new SplFileInfo62328(__FILE__); + +echo (string)$fi . PHP_EOL; +echo (string)$fi->__toString() . PHP_EOL; + +?> +--EXPECT-- +__toString +__toString diff --git a/Zend/zend.c b/Zend/zend.c index 18c4f11604..be30e92e7d 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -258,6 +258,12 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop { TSRMLS_FETCH(); + if (Z_OBJCE_P(expr)->__tostring) { + 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; |