#6: * Fix for Scope tests

Author: EdmondDantes

scope.c

@@ -1229,7 +1229,7 @@ static void scope_destroy(zend_object *object)
 	}
 }
 
-static HashTable *async_scope_object_gc(zend_object *object, zval **table, int *num)
+static HashTable *scope_object_gc(zend_object *object, zval **table, int *num)
 {
 	async_scope_object_t *scope_obj = (async_scope_object_t *)object;
 	async_scope_t *scope = scope_obj->scope;
@@ -1281,6 +1281,32 @@ static HashTable *async_scope_object_gc(zend_object *object, zval **table, int *
 	return NULL;
 }
 
+static void scope_object_free(zend_object *object)
+{
+	async_scope_object_t *scope_object = (async_scope_object_t *) object;
+
+	async_scope_t *scope = scope_object->scope;
+
+	if (scope == NULL) {
+		return;
+	}
+
+	scope_object->scope = NULL;
+	scope->scope.scope_object = NULL;
+	zend_object_std_dtor(&scope_object->std);
+
+	// At this point, the user-defined Scope object is about to be destroyed.
+	// This means we are obligated to cancel the Scope and all its child Scopes along with their coroutines.
+	// However, the Scope itself will not be destroyed.
+	if (false == scope->scope.try_to_dispose(&scope->scope)) {
+		zend_object *exception = async_new_exception(
+			async_ce_cancellation_exception, "Scope is being disposed due to object destruction"
+		);
+
+		ZEND_ASYNC_SCOPE_CANCEL(&scope->scope, exception, true, ZEND_ASYNC_SCOPE_IS_DISPOSE_SAFELY(&scope->scope));
+	}
+}
+
 void async_register_scope_ce(void)
 {
 	async_ce_scope_provider = register_class_Async_ScopeProvider();
@@ -1294,7 +1320,8 @@ void async_register_scope_ce(void)
 
 	async_scope_handlers.clone_obj = NULL;
 	async_scope_handlers.dtor_obj = scope_destroy;
-	async_scope_handlers.get_gc = async_scope_object_gc;
+	async_scope_handlers.get_gc = scope_object_gc;
+	async_scope_handlers.free_obj = scope_object_free;
 }
 
 /**

tests/scope/019-scope_gc_basic.phpt

@@ -5,6 +5,7 @@ Scope: GC handler basic functionality
 
 use Async\Scope;
 use function Async\spawn;
+use function Async\suspend;
 
 // Test that GC handler is registered and functioning for scope
 $scope = new Scope();
@@ -16,6 +17,8 @@ $coroutine = $scope->spawn(function() {
 // Force garbage collection to ensure our GC handler is called
 $collected = gc_collect_cycles();
 
+suspend(); // Suspend to simulate coroutine lifecycle
+
 // Check that coroutine completed successfully
 $result = $coroutine->getResult();
 var_dump($result);

tests/scope/020-scope_gc_with_finally.phpt

@@ -5,6 +5,7 @@ Scope: GC handler with finally handlers
 
 use Async\Scope;
 use function Async\spawn;
+use function Async\suspend;
 
 // Test GC with scope finally handlers containing callable ZVALs
 $scope = new Scope();
@@ -21,6 +22,8 @@ $coroutine = $scope->spawn(function() {
 // Force garbage collection
 $collected = gc_collect_cycles();
 
+suspend(); // Suspend to simulate coroutine lifecycle
+
 // Wait for completion
 $result = $coroutine->getResult();
 var_dump($result);
@@ -34,5 +37,5 @@ var_dump($collected >= 0);
 ?>
 --EXPECT--
 string(18) "scope_finally_test"
-Scope finally executed
-bool(true)
+bool(true)
+Scope finally executed

tests/scope/021-scope_gc_with_context.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Scope: GC handler with context data
+--FILE--
+<?php
+
+use Async\Scope;
+use Async\Context;
+use function Async\spawn;
+
+// Test for a special case:
+// If a Scope is created with a faulty constructor,
+// the dtor method will not be called. However, even in this case, the
+// memory must be properly freed.
+$scope = new Scope(2);
+
+?>
+--EXPECTF--
+Fatal error: Uncaught ArgumentCountError: %s
+%a