From 22ed362810c1b3a5ecb54ebd1d50d804c7fc3159 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 9 Jul 2019 11:04:05 +0200 Subject: [PATCH] Revert "Fixed bug #76980" This reverts commit 35353dc49a73a58c17c7896c4c4c3997ef2c007d. This changes causes issues for Symfony, see https://github.com/symfony/symfony/issues/32395. I'm reverting it from PHP 7.2 and PHP 7.3 and only leaving it in PHP 7.4. --- Zend/tests/bug49908.phpt | 12 ++++-------- Zend/zend_execute_API.c | 28 +++++++--------------------- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/Zend/tests/bug49908.phpt b/Zend/tests/bug49908.phpt index af8ab45934e50..2f33080258881 100644 --- a/Zend/tests/bug49908.phpt +++ b/Zend/tests/bug49908.phpt @@ -13,22 +13,18 @@ spl_autoload_register(function ($className) { } }); -try { - new Foo(); -} catch (Exception $e) { } - -// We never reach here. -var_dump(new Foo()); +new Foo; ?> --EXPECTF-- string(3) "Foo" string(3) "Bar" -Fatal error: During class fetch: Uncaught Exception: Bar in %s:%d +Fatal error: Uncaught Exception: Bar in %s:%d Stack trace: #0 [internal function]: {closure}('Bar') #1 %s(%d): spl_autoload_call('Bar') #2 [internal function]: {closure}('Foo') #3 %s(%d): spl_autoload_call('Foo') -#4 {main} in %s on line %d +#4 {main} + thrown in %s on line %d diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 57ccf6c9c8d85..9f10843b6b82f 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1424,28 +1424,14 @@ zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, const zval * if (fetch_type & ZEND_FETCH_CLASS_NO_AUTOLOAD) { return zend_lookup_class_ex(class_name, key, 0); } else if ((ce = zend_lookup_class_ex(class_name, key, 1)) == NULL) { - if (fetch_type & ZEND_FETCH_CLASS_SILENT) { - return NULL; - } - if (EG(exception)) { - if (!(fetch_type & ZEND_FETCH_CLASS_EXCEPTION)) { - zend_string *exception_str; - zval exception_zv; - ZVAL_OBJ(&exception_zv, EG(exception)); - Z_ADDREF(exception_zv); - zend_clear_exception(); - exception_str = zval_get_string(&exception_zv); - zend_error_noreturn(E_ERROR, - "During class fetch: Uncaught %s", ZSTR_VAL(exception_str)); + if ((fetch_type & ZEND_FETCH_CLASS_SILENT) == 0 && !EG(exception)) { + if ((fetch_type & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_INTERFACE) { + zend_throw_or_error(fetch_type, NULL, "Interface '%s' not found", ZSTR_VAL(class_name)); + } else if ((fetch_type & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_TRAIT) { + zend_throw_or_error(fetch_type, NULL, "Trait '%s' not found", ZSTR_VAL(class_name)); + } else { + zend_throw_or_error(fetch_type, NULL, "Class '%s' not found", ZSTR_VAL(class_name)); } - return NULL; - } - if ((fetch_type & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_INTERFACE) { - zend_throw_or_error(fetch_type, NULL, "Interface '%s' not found", ZSTR_VAL(class_name)); - } else if ((fetch_type & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_TRAIT) { - zend_throw_or_error(fetch_type, NULL, "Trait '%s' not found", ZSTR_VAL(class_name)); - } else { - zend_throw_or_error(fetch_type, NULL, "Class '%s' not found", ZSTR_VAL(class_name)); } return NULL; }