% Added code to catch exceptions in the main coroutine. The exception is now passed to the main coroutine’s finalize method instead of being displayed on screen.

* Fixed an issue with correctly passing the exception into the coroutine.

Author: EdmondDantes

Zend/zend.c

@@ -41,6 +41,9 @@
 #include "Optimizer/zend_optimizer.h"
 #include "php.h"
 #include "php_globals.h"
+#ifdef PHP_ASYNC_API
+#include "zend_async_API.h"
+#endif
 
 // FIXME: Breaks the declaration of the function below
 #undef zenderror
@@ -1946,9 +1949,18 @@ ZEND_API zend_result zend_execute_script(int type, zval *retval, zend_file_handl
 			if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) {
 				zend_user_exception_handler();
 			}
+#ifdef PHP_ASYNC_API
+			// If we are inside a coroutine,
+			// we do not call the final error handler,
+			// as the exception will be handled higher up in the method ZEND_ASYNC_RUN_SCHEDULER_AFTER_MAIN
+			if (false == ZEND_ASYNC_CURRENT_COROUTINE && EG(exception)) {
+				ret = zend_exception_error(EG(exception), E_ERROR);
+			}
+#else
 			if (EG(exception)) {
 				ret = zend_exception_error(EG(exception), E_ERROR);
 			}
+#endif
 		}
 		zend_destroy_static_vars(op_array);
 		destroy_op_array(op_array);

Zend/zend_async_API.c

@@ -559,16 +559,9 @@ ZEND_API void zend_async_waker_callback_cancel(
 	if (UNEXPECTED(exception != NULL)) {
 		ZEND_ASYNC_RESUME_WITH_ERROR(coroutine, exception, false);
 	} else {
-
-		if (result == NULL) {
-			exception = zend_async_new_exception(
-				ZEND_ASYNC_EXCEPTION_CANCELLATION, "Operation has been cancelled"
-			);
-		} else {
-			exception = result;
-		}
-
-		ZEND_ASYNC_RESUME_WITH_ERROR(coroutine, exception, false);
+		ZEND_ASYNC_RESUME_WITH_ERROR(coroutine, zend_async_new_exception(
+			ZEND_ASYNC_EXCEPTION_CANCELLATION, "Operation has been cancelled"
+		), true);
 	}
 }
 

Zend/zend_async_API.h

@@ -135,6 +135,7 @@ typedef void (*zend_async_event_callback_fn)
 typedef void (*zend_async_event_callback_dispose_fn)(zend_async_event_callback_t *callback, zend_async_event_t * event);
 typedef void (*zend_async_event_add_callback_t)(zend_async_event_t *event, zend_async_event_callback_t *callback);
 typedef void (*zend_async_event_del_callback_t)(zend_async_event_t *event, zend_async_event_callback_t *callback);
+typedef bool (*zend_async_event_callbacks_notify_t)(zend_async_event_t *event, void *result, zend_object *exception);
 typedef void (*zend_async_event_start_t) (zend_async_event_t *event);
 typedef void (*zend_async_event_stop_t) (zend_async_event_t *event);
 typedef void (*zend_async_event_dispose_t) (zend_async_event_t *event);
@@ -291,6 +292,11 @@ struct _zend_async_event_s {
 	/* Methods */
 	zend_async_event_add_callback_t add_callback;
 	zend_async_event_del_callback_t del_callback;
+	/*
+	 * Handler that is invoked before all event listeners are notified.
+	 * May be NULL.
+	 */
+	zend_async_event_callbacks_notify_t before_notify;
 	zend_async_event_start_t start;
 	zend_async_event_stop_t stop;
 	zend_async_event_dispose_t dispose;
@@ -404,6 +410,11 @@ zend_async_callbacks_remove(zend_async_event_t *event, const zend_async_event_ca
 static zend_always_inline void
 zend_async_callbacks_notify(zend_async_event_t *event, void *result, zend_object *exception)
 {
+	// If pre-notify returns false, we stop notifying callbacks
+	if (event->before_notify != NULL && false == event->before_notify(event, result, exception)) {
+		return;
+	}
+
 	if (event->callbacks.data == NULL) {
 		return;
 	}