Merge branch 'PHP-8.0'

cmb69 · cmb69 · commit d017b3e1a0dd · 2021-01-01T17:42:27.000+01:00
* PHP-8.0:
  Fix build
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -390,7 +390,7 @@ static void _class_string(smart_str *str, zend_class_entry *ce, zval *obj, char
 			_class_const_string(str, ZSTR_VAL(key), c, ZSTR_VAL(sub_indent));
 			if (UNEXPECTED(EG(exception))) {
 				zend_string_release(sub_indent);
-				RETURN_THROWS();
+				return;
 			}
 		} ZEND_HASH_FOREACH_END();
 	}

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ static void _class_string(smart_str str, zend_class_entry ce, zval *obj, char`
`390`	`390`	`_class_const_string(str, ZSTR_VAL(key), c, ZSTR_VAL(sub_indent));`
`391`	`391`	`if (UNEXPECTED(EG(exception))) {`
`392`	`392`	`zend_string_release(sub_indent);`
`393`		`- RETURN_THROWS();`
	`393`	`+ return;`
`394`	`394`	`}`
`395`	`395`	`} ZEND_HASH_FOREACH_END();`
`396`	`396`	`}`