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

- MFH: Fix code && new test

Browse Source
This commit is contained in:
Felipe Pena 2009-05-11 15:03:47 +00:00
parent 85bcfa89ad
commit 4f068cc23b
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Zend/tests/exception_010.phpt Normal file
View File

@ -0,0 +1,30 @@
--TEST--
Testing Exception's methods
--FILE--
<?php
$x = new Exception;
$x->gettraceasstring(1);
$x->gettraceasstring();
$x->__tostring(1);
$x->gettrace(1);
$x->getline(1);
$x->getfile(1);
$x->getmessage(1);
$x->getcode(1);
?>
--EXPECTF--
Warning: Exception::getTraceAsString() expects exactly 0 parameters, 1 given in %s on line %d
Warning: Exception::__toString() expects exactly 0 parameters, 1 given in %s on line %d
Warning: Exception::getTrace() expects exactly 0 parameters, 1 given in %s on line %d
Warning: Exception::getLine() expects exactly 0 parameters, 1 given in %s on line %d
Warning: Exception::getFile() expects exactly 0 parameters, 1 given in %s on line %d
Warning: Exception::getMessage() expects exactly 0 parameters, 1 given in %s on line %d
Warning: Exception::getCode() expects exactly 0 parameters, 1 given in %s on line %d

9
Zend/zend_exceptions.c
View File

@ -487,10 +487,13 @@ static int _build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list arg
ZEND_METHOD(exception, getTraceAsString)
{
zval *trace;
char *res = estrdup(""), **str = &res, *s_tmp;
char *res, **str, *s_tmp;
int res_len = 0, *len = &res_len, num = 0;
DEFAULT_0_PARAMS;
res = estrdup("");
str = &res;
trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, (apply_func_args_t)_build_trace_string, 3, str, len, &num);
@ -534,12 +537,14 @@ int zend_spprintf(char **message, int max_len, char *format, ...) /* {{{ */
ZEND_METHOD(exception, __toString)
{
zval message, file, line, *trace, *exception;
char *str = estrndup("", 0), *prev_str;
char *str, *prev_str;
int len = 0;
zend_fcall_info fci;
zval fname;
DEFAULT_0_PARAMS;
str = estrndup("", 0);
exception = getThis();
ZVAL_STRINGL(&fname, "gettraceasstring", sizeof("gettraceasstring")-1, 1);