Apply non-blocking corrections from JSPI pull request

Author: mho22

packages/php-wasm/compile/php/php7.3.patch

@@ -68,13 +68,16 @@ diff --git a/php-src/main/streams/cast.c b/php-src/main/streams/cast.c
 
 
 diff --git a/php-src/Zend/zend_variables.c b/php-src/Zend/zend_variables.c
-index c2594274dd4..42fbacf8c6e 100644
+index c2594274dd4..2c3a01ece57 100644
 --- a/php-src/Zend/zend_variables.c
 +++ b/php-src/Zend/zend_variables.c
-@@ -44,6 +44,13 @@ static void ZEND_FASTCALL zend_ast_ref_destroy_wrapper(zend_ast_ref *ast);
+@@ -44,6 +44,16 @@ static void ZEND_FASTCALL zend_ast_ref_destroy_wrapper(zend_ast_ref *ast);
 
  typedef void (ZEND_FASTCALL *zend_rc_dtor_func_t)(zend_refcounted *p);
 
++// Note: zend_list_free_wrapper function is required because active streams
++// would otherwise cause a function signature mismatch. zend_list_free
++// returns an int, while zend_rc_dtor_func_t expects a void return type.
 +static void zend_list_free_wrapper(zend_refcounted *p) {
 +	zend_resource *res = (zend_resource*)p;
 +	zval zv;
@@ -85,12 +88,12 @@ index c2594274dd4..42fbacf8c6e 100644
  static const zend_rc_dtor_func_t zend_rc_dtor_func[] = {
  	/* IS_UNDEF        */ (zend_rc_dtor_func_t)zend_empty_destroy,
  	/* IS_NULL         */ (zend_rc_dtor_func_t)zend_empty_destroy,
-@@ -54,7 +61,9 @@ static const zend_rc_dtor_func_t zend_rc_dtor_func[] = {
+@@ -54,7 +64,9 @@ static const zend_rc_dtor_func_t zend_rc_dtor_func[] = {
  	/* IS_STRING       */ (zend_rc_dtor_func_t)zend_string_destroy,
  	/* IS_ARRAY        */ (zend_rc_dtor_func_t)zend_array_destroy_wrapper,
  	/* IS_OBJECT       */ (zend_rc_dtor_func_t)zend_object_destroy_wrapper,
 -	/* IS_RESOURCE     */ (zend_rc_dtor_func_t)zend_resource_destroy_wrapper,
-+	// Info: zend_resource_destroy_wrapper is an alias for zend_list_free
++	// Note: zend_resource_destroy_wrapper is an alias for zend_list_free
 +	// https://github.com/php/php-src/blob/PHP-7.3.33/Zend/zend_variables.c#L41
 +	/* IS_RESOURCE     */ zend_list_free_wrapper,
  	/* IS_REFERENCE    */ (zend_rc_dtor_func_t)zend_reference_destroy,

packages/php-wasm/compile/php/php7.4.patch

@@ -61,24 +61,27 @@ diff --git a/php-src/ext/standard/file.c b/php-src/ext/standard/file.c
 
 
 diff --git a/php-src/Zend/zend_variables.c b/php-src/Zend/zend_variables.c
-index 810866a1be2..fdd1c80fea5 100644
+index 810866a1be2..0cc2a95dcf2 100644
 --- a/php-src/Zend/zend_variables.c
 +++ b/php-src/Zend/zend_variables.c
-@@ -36,6 +36,13 @@ static void ZEND_FASTCALL zend_empty_destroy(zend_reference *ref);
+@@ -36,6 +36,16 @@ static void ZEND_FASTCALL zend_empty_destroy(zend_reference *ref);
 
  typedef void (ZEND_FASTCALL *zend_rc_dtor_func_t)(zend_refcounted *p);
 
++// Note: zend_list_free_wrapper function is required because active streams
++// would otherwise cause a function signature mismatch. zend_list_free
++// returns an int, while zend_rc_dtor_func_t expects a void return type.
 +static void zend_list_free_wrapper(zend_refcounted *p) {
-+    zend_resource *res = (zend_resource*)p;
-+    zval zv;
-+    ZVAL_RES(&zv, res);
-+    zend_list_free(&zv);
++	zend_resource *res = (zend_resource*)p;
++	zval zv;
++	ZVAL_RES(&zv, res);
++	zend_list_free(&zv);
 +}
 +
  static const zend_rc_dtor_func_t zend_rc_dtor_func[] = {
  	/* IS_UNDEF        */ (zend_rc_dtor_func_t)zend_empty_destroy,
  	/* IS_NULL         */ (zend_rc_dtor_func_t)zend_empty_destroy,
-@@ -46,7 +53,7 @@ static const zend_rc_dtor_func_t zend_rc_dtor_func[] = {
+@@ -46,7 +56,7 @@ static const zend_rc_dtor_func_t zend_rc_dtor_func[] = {
  	/* IS_STRING       */ (zend_rc_dtor_func_t)zend_string_destroy,
  	/* IS_ARRAY        */ (zend_rc_dtor_func_t)zend_array_destroy,
  	/* IS_OBJECT       */ (zend_rc_dtor_func_t)zend_objects_store_del,

packages/php-wasm/node/src/lib/xdebug/test.ts

@@ -0,0 +1,3 @@
+import { withXdebug } from './with-xdebug';
+
+withXdebug('8.3', {});

packages/php-wasm/node/src/lib/xdebug/with-xdebug.ts

@@ -30,7 +30,8 @@ export async function withXdebug(
 			if (options.onRuntimeInitialized) {
 				options.onRuntimeInitialized(phpRuntime);
 			}
-			/* The extension file previously read
+			/**
+			 * The extension file previously read
 			 * is written inside the /extensions directory
 			 */
 			if (

packages/php-wasm/node/vite.config.ts

@@ -23,7 +23,7 @@ export default defineConfig(function () {
 				enforce: 'pre',
 
 				resolveId(id: string, importer: string): any {
-					if (id.startsWith('\0import-url:')) {
+					if (id.startsWith('import-url:')) {
 						return id;
 					}
 
@@ -32,15 +32,15 @@ export default defineConfig(function () {
 							path.dirname(importer),
 							id
 						);
-						return `\0import-url:${filepath}`;
+						return `import-url:${filepath}`;
 					}
 
 					return null;
 				},
 
 				load(id: string): any {
-					if (id.startsWith('\0import-url:')) {
-						const encodedPath = id.slice('\0import-url:'.length);
+					if (id.startsWith('import-url:')) {
+						const encodedPath = id.slice('import-url:'.length);
 						const filePath = encodedPath.replace('?url', '');
 
 						return {