% refactoring typedef zend_async_iterator_t* (*zend_async_new_iterator_t)(

              	zval *array,
              	zend_object_iterator *zend_iterator,
              	zend_fcall_t *fcall,
              	zend_async_iterator_handler_t handler,
              	zend_async_scope_t *scope,
              	unsigned int concurrency,
              	int32_t priority,
              	size_t iterator_size
              );
add scope parameter

Author: EdmondDantes

async_API.c

@@ -522,6 +522,7 @@ void iterator_coroutine_first_entry(void)
 		await_iterator->zend_iterator,
 		NULL,
 		await_iterator_handler,
+		ZEND_ASYNC_CURRENT_SCOPE,
 		await_context->concurrency,
 		0,
 		sizeof(async_await_iterator_iterator_t)

coroutine.c

@@ -416,6 +416,7 @@ static void async_coroutine_call_finally_handlers(async_coroutine_t *coroutine)
 		NULL,
 		NULL,
 		finally_handlers_iterator_handler,
+		coroutine->coroutine.scope,
 		0,
 		0,
 		0

iterator.c

@@ -106,6 +106,7 @@ async_iterator_t * async_iterator_new(
 		zend_object_iterator *zend_iterator,
 		zend_fcall_t *fcall,
 		async_iterator_handler_t handler,
+		zend_async_scope_t *scope,
 		unsigned int concurrency,
 		int32_t priority,
 		size_t iterator_size
@@ -129,6 +130,11 @@ async_iterator_t * async_iterator_new(
 	iterator->concurrency = concurrency;
 	iterator->priority = priority;
 
+	if (scope == NULL) {
+		scope = ZEND_ASYNC_CURRENT_SCOPE;
+	}
+	iterator->scope = scope;
+
 	if (zend_iterator == NULL) {
 		ZVAL_COPY(&iterator->array, array);
 	} else if (zend_iterator) {

iterator.h

@@ -36,6 +36,7 @@ async_iterator_t * async_iterator_new(
 	zend_object_iterator *zend_iterator,
 	zend_fcall_t *fcall,
 	async_iterator_handler_t handler,
+	zend_async_scope_t *scope,
 	unsigned int concurrency,
 	int32_t priority,
 	size_t iterator_size

scope.c

@@ -1482,6 +1482,7 @@ static void async_scope_call_finally_handlers(async_scope_t *scope)
 		NULL,
 		NULL,
 		scope_finally_handlers_iterator_handler,
+		child_scope,
 		0,
 		1,
 		0
@@ -1498,7 +1499,6 @@ static void async_scope_call_finally_handlers(async_scope_t *scope)
 	context->scope = scope;
 	context->composite_exception = NULL;
 
-	iterator->scope = child_scope;
 	iterator->extended_data = context;
 	iterator->extended_dtor = scope_finally_handlers_iterator_dtor;