From 1a0ddf988c92614de6890c12ee305c4bf1ff4302 Mon Sep 17 00:00:00 2001 From: Aaron Piotrowski Date: Fri, 3 Jul 2015 17:28:11 -0500 Subject: [PATCH] Switch code on thrown Errors to 0, update related tests --- Zend/tests/methods-on-non-objects-catch.phpt | 2 +- Zend/tests/methods-on-non-objects-usort.phpt | 8 ++++---- Zend/zend.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Zend/tests/methods-on-non-objects-catch.phpt b/Zend/tests/methods-on-non-objects-catch.phpt index 2082433181..083ae75e49 100644 --- a/Zend/tests/methods-on-non-objects-catch.phpt +++ b/Zend/tests/methods-on-non-objects-catch.phpt @@ -16,6 +16,6 @@ echo "Alive\n"; ?> --EXPECTF-- -int(1) +int(0) string(%d) "Call to a member function method() on null" Alive diff --git a/Zend/tests/methods-on-non-objects-usort.phpt b/Zend/tests/methods-on-non-objects-usort.phpt index d52a0fddb5..5547695f72 100644 --- a/Zend/tests/methods-on-non-objects-usort.phpt +++ b/Zend/tests/methods-on-non-objects-usort.phpt @@ -20,13 +20,13 @@ var_dump($list); echo "Alive\n"; ?> --EXPECTF-- -int(1) +int(0) string(43) "Call to a member function compare() on null" -int(1) +int(0) string(43) "Call to a member function compare() on null" -int(1) +int(0) string(43) "Call to a member function compare() on null" -int(1) +int(0) string(43) "Call to a member function compare() on null" array(5) { [0]=> diff --git a/Zend/zend.c b/Zend/zend.c index af2abd13c6..9e8613aa55 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1302,7 +1302,7 @@ ZEND_API void zend_throw_error(zend_class_entry *exception_ce, const char *forma // TODO: we can't convert compile-time errors to exceptions yet??? if (EG(current_execute_data) && !CG(in_compilation)) { - zend_throw_exception(exception_ce, message, E_ERROR); + zend_throw_exception(exception_ce, message, 0); } else { zend_error(E_ERROR, message); } -- 2.40.0