clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop duplicate object-to-type notices

Browse Source 
We already generate a recoverable fatal for these earlier, no need
to throw an additional notice.
This commit is contained in:
Nikita Popov 2015-06-22 16:24:11 +02:00
parent d4cd659b5a
commit 8a83aed458
5 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zend/tests/call_with_refs.phpt
View File

@ -14,5 +14,4 @@ $data = call_user_func_array("substr_replace",array(&$my_var, new StdClass(),1))
echo "OK!";
--EXPECT--
Object of class stdClass could not be converted to string
Object of class stdClass to string conversion
OK!

12
Zend/zend_operators.c
View File

@ -226,7 +226,7 @@ try_again:
/* }}} */
/* {{{ convert_object_to_type */
/* {{{ convert_object_to_type: dst will be either ctype or UNDEF */
#define convert_object_to_type(op, dst, ctype, conv_func) \
ZVAL_UNDEF(dst); \
if (Z_OBJ_HT_P(op)->cast_object) { \
@ -332,7 +332,6 @@ try_again:
if (Z_TYPE(dst) == IS_LONG) {
ZVAL_COPY_VALUE(op, &dst);
} else {
zend_error(E_NOTICE, "Object of class %s could not be converted to int", Z_OBJCE_P(op)->name->val);
ZVAL_LONG(op, 1);
}
@ -393,8 +392,6 @@ try_again:
if (Z_TYPE(dst) == IS_DOUBLE) {
ZVAL_COPY_VALUE(op, &dst);
} else {
zend_error(E_NOTICE, "Object of class %s could not be converted to float", Z_OBJCE_P(op)->name->val);
ZVAL_DOUBLE(op, 1.0);
}
break;
@ -542,13 +539,11 @@ try_again:
zval dst;
convert_object_to_type(op, &dst, IS_STRING, convert_to_string);
zval_dtor(op);
if (Z_TYPE(dst) == IS_STRING) {
zval_dtor(op);
ZVAL_COPY_VALUE(op, &dst);
} else {
zend_error(E_NOTICE, "Object of class %s to string conversion", Z_OBJCE_P(op)->name->val);
zval_dtor(op);
ZVAL_NEW_STR(op, zend_string_init("Object", sizeof("Object")-1, 0));
}
break;
@ -742,7 +737,6 @@ try_again:
if (Z_TYPE(dst) == IS_LONG) {
return Z_LVAL(dst);
} else {
zend_error(E_NOTICE, "Object of class %s could not be converted to int", Z_OBJCE_P(op)->name->val);
return 1;
}
}
@ -782,8 +776,6 @@ try_again:
if (Z_TYPE(dst) == IS_DOUBLE) {
return Z_DVAL(dst);
} else {
zend_error(E_NOTICE, "Object of class %s could not be converted to double", Z_OBJCE_P(op)->name->val);
return 1.0;
}
}

1
ext/openssl/tests/003.phpt
View File

@ -27,7 +27,6 @@ echo "Done\n";
?>
--EXPECTF--
string(57) "Object of class stdClass could not be converted to string"
string(45) "Object of class stdClass to string conversion"
string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert"
bool(false)
object(stdClass)#1 (0) {

1
ext/standard/tests/general_functions/type.phpt
View File

@ -345,7 +345,6 @@ string(14) "Resource id #%d"
bool(true)
string(14) "Resource id #%d"
string(57) "Object of class stdClass could not be converted to string"
string(45) "Object of class stdClass to string conversion"
bool(true)
string(6) "Object"
Done

1
tests/classes/tostring_004.phpt
View File

@ -38,7 +38,6 @@ printf($obj . "\n");
Object with no __toString():
Try 1:
Error: 4096 - Object of class stdClass could not be converted to string
Error: 8 - Object of class stdClass to string conversion
Object
Try 2: