diff options
| author | Nikita Popov <nikic@php.net> | 2015-06-22 16:24:11 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-06-22 16:25:32 +0200 |
| commit | 8a83aed45847edf7e6ed59a996bc991dec3ef96b (patch) | |
| tree | f050073af694f90b7997f33fa8ee9394b3870080 /Zend | |
| parent | d4cd659b5ab6032a7a3c7bbbd19d021f7ca47b0d (diff) | |
| download | php-git-8a83aed45847edf7e6ed59a996bc991dec3ef96b.tar.gz | |
Drop duplicate object-to-type notices
We already generate a recoverable fatal for these earlier, no need
to throw an additional notice.
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/tests/call_with_refs.phpt | 1 | ||||
| -rw-r--r-- | Zend/zend_operators.c | 12 |
2 files changed, 2 insertions, 11 deletions
diff --git a/Zend/tests/call_with_refs.phpt b/Zend/tests/call_with_refs.phpt index acad134f87..84c4edfc20 100644 --- a/Zend/tests/call_with_refs.phpt +++ b/Zend/tests/call_with_refs.phpt @@ -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! diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 26584745dc..d9670a5a49 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -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; } } |