archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove need to pass error level

Browse source
This commit is contained in:
Aaron Piotrowski 2015-07-03 16:04:33 -05:00
parent 5a99c07ecc
commit 22c38b2ef5
16 changed files with 938 additions and 941 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Zend/zend_exceptions.c
View file

@ -261,7 +261,7 @@ ZEND_METHOD(exception, __construct)
} else {
ce = base_ce;
}
zend_throw_error(zend_ce_error, E_EXCEPTION, "Wrong parameters for %s([string $message [, long $code [, Throwable $previous = NULL]]])", ZSTR_VAL(ce->name));
zend_throw_error(zend_ce_error, "Wrong parameters for %s([string $message [, long $code [, Throwable $previous = NULL]]])", ZSTR_VAL(ce->name));
return;
}
@ -297,7 +297,7 @@ ZEND_METHOD(error_exception, __construct)
} else {
ce = zend_ce_error_exception;
}
zend_throw_error(zend_ce_error, E_EXCEPTION, "Wrong parameters for %s([string $message [, long $code, [ long $severity, [ string $filename, [ long $lineno [, Throwable $previous = NULL]]]]]])", ZSTR_VAL(ce->name));
zend_throw_error(zend_ce_error, "Wrong parameters for %s([string $message [, long $code, [ long $severity, [ string $filename, [ long $lineno [, Throwable $previous = NULL]]]]]])", ZSTR_VAL(ce->name));
return;
}
@ -1033,7 +1033,7 @@ ZEND_API void zend_throw_exception_object(zval *exception) /* {{{ */
exception_ce = Z_OBJCE_P(exception);
if (!exception_ce || !instanceof_function(exception_ce, zend_ce_throwable)) {
zend_throw_error(zend_ce_error, E_EXCEPTION, "Cannot throw objects that do not implement Throwable");
zend_throw_error(zend_ce_error, "Cannot throw objects that do not implement Throwable");
return;
}
zend_throw_exception_internal(exception);