From 66c8a9d672cd1867fa02ccad499e68d132a5f947 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 23 Dec 2017 13:25:26 +0100 Subject: [PATCH] Remove EH_SUPPRESS mode It is unused and does not work in any meaningful way: Warnings are suppressed, but everything else (both notices and fatals) are not. It would make some sense if it suppressed warnings and lower, but right now this is a pointless mode. --- Zend/zend.h | 1 - main/main.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Zend/zend.h b/Zend/zend.h index cf6bd37d5d..340e2867ca 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -313,7 +313,6 @@ END_EXTERN_C() typedef enum { EH_NORMAL = 0, - EH_SUPPRESS, EH_THROW } zend_error_handling_t; diff --git a/main/main.c b/main/main.c index 8842f8f86f..7dd65253ed 100644 --- a/main/main.c +++ b/main/main.c @@ -1074,8 +1074,8 @@ static ZEND_COLD void php_error_cb(int type, const char *error_filename, const u PG(last_error_lineno) = error_lineno; } - /* according to error handling mode, suppress error, throw exception or show it */ - if (EG(error_handling) != EH_NORMAL) { + /* according to error handling mode, throw exception or show it */ + if (EG(error_handling) == EH_THROW) { switch (type) { case E_ERROR: case E_CORE_ERROR: @@ -1097,7 +1097,7 @@ static ZEND_COLD void php_error_cb(int type, const char *error_filename, const u /* throw an exception if we are in EH_THROW mode * but DO NOT overwrite a pending exception */ - if (EG(error_handling) == EH_THROW && !EG(exception)) { + if (!EG(exception)) { zend_throw_error_exception(EG(exception_class), buffer, 0, type); } efree(buffer); -- 2.50.1