com php-src: Drop superfluous __toString handling code : Zend/zend_API.c

From: Date: Mon, 22 Jun 2015 13:33:41 +0000
Subject: com php-src: Drop superfluous __toString handling code : Zend/zend_API.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87445@lists.php.net to get a copy of this message
Commit: 628d4394022d60e519377bb3b2a05722de5472ab Author: Nikita Popov <nikic@php.net> Mon, 22 Jun 2015 15:33:41 +0200 Parents: 4807b164fd801381ded0f13c3643f56ef427cda9 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=628d4394022d60e519377bb3b2a05722de5472ab Log: Drop superfluous __toString handling code This is already covered by the cast_object invokation above it. We do not use this kind of fallback in any other casting code anymore. Changed paths: M Zend/zend_API.c Diff: diff --git a/Zend/zend_API.c b/Zend/zend_API.c index f49957a..a1f4ef6 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -458,16 +458,7 @@ ZEND_API int ZEND_FASTCALL zend_parse_arg_str_weak(zval *arg, zend_string **dest *dest = Z_STR_P(arg); return 1; } - } - /* Standard PHP objects */ - if (Z_OBJ_HT_P(arg) == &std_object_handlers || !Z_OBJ_HANDLER_P(arg, cast_object)) { - SEPARATE_ZVAL_NOREF(arg); - if (zend_std_cast_object_tostring(arg, arg, IS_STRING) == SUCCESS) { - *dest = Z_STR_P(arg); - return 1; - } - } - if (!Z_OBJ_HANDLER_P(arg, cast_object) && Z_OBJ_HANDLER_P(arg, get)) { + } else if (Z_OBJ_HANDLER_P(arg, get)) { zval rv; zval *z = Z_OBJ_HANDLER_P(arg, get)(arg, &rv);

« previous php.cvs (#87445) next »