summaryrefslogtreecommitdiff
path: root/ext/standard/assert.c
diff options
context:
space:
mode:
authorAaron Piotrowski <aaron@trowski.com>2016-07-05 02:08:39 -0500
committerAaron Piotrowski <aaron@trowski.com>2016-07-05 02:08:39 -0500
commit24237027bc7e4f7aed9287fe9815c0577eeb1c22 (patch)
treebc23b05ba89a75f0e0711933371f708b96e63345 /ext/standard/assert.c
parent42666da1714673d537356221e688f57f404fe1d2 (diff)
parente9832b5ab1d986ddd3ea0705bcbc5a391dc16614 (diff)
downloadphp-git-24237027bc7e4f7aed9287fe9815c0577eeb1c22.tar.gz
Merge branch 'throw-error-in-extensions'
Diffstat (limited to 'ext/standard/assert.c')
-rw-r--r--ext/standard/assert.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index f66e343f98..fe04f329e2 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -180,10 +180,10 @@ PHP_FUNCTION(assert)
if (zend_eval_stringl(myeval, Z_STRLEN_P(assertion), &retval, compiled_string_description) == FAILURE) {
efree(compiled_string_description);
if (!description) {
- php_error_docref(NULL, E_RECOVERABLE_ERROR, "Failure evaluating code: %s%s", PHP_EOL, myeval);
+ zend_throw_error(NULL, "Failure evaluating code: %s%s", PHP_EOL, myeval);
} else {
zend_string *str = zval_get_string(description);
- php_error_docref(NULL, E_RECOVERABLE_ERROR, "Failure evaluating code: %s%s:\"%s\"", PHP_EOL, ZSTR_VAL(str), myeval);
+ zend_throw_error(NULL, "Failure evaluating code: %s%s:\"%s\"", PHP_EOL, ZSTR_VAL(str), myeval);
zend_string_release(str);
}
if (ASSERTG(bail)) {