Merge pull request #503 from marekskopal/php8_0-build-fix

stesie · web-flow · commit 7c40690ec0bb · 2023-02-08T20:42:37.000+01:00
Fixed build on PHP 8.0.x
diff --git a/v8js_object_export.cc b/v8js_object_export.cc
@@ -38,7 +38,11 @@ v8::Local<v8::Value> v8js_propagate_exception(v8js_ctx *ctx) /* {{{ */
 {
 	v8::Local<v8::Value> return_value = v8::Null(ctx->isolate);
 
+#if PHP_VERSION_ID < 80100
+	if (!(ctx->flags & V8JS_FLAG_PROPAGATE_PHP_EXCEPTIONS) || zend_is_unwind_exit(EG(exception))) {
+#else
 	if (!(ctx->flags & V8JS_FLAG_PROPAGATE_PHP_EXCEPTIONS) || zend_is_graceful_exit(EG(exception)) || zend_is_unwind_exit(EG(exception))) {
+#endif
 		v8js_terminate_execution(ctx->isolate);
 		return return_value;
 	}

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,11 @@ v8::Local<v8::Value> v8js_propagate_exception(v8js_ctx ctx) / {{{ */`
`38`	`38`	`{`
`39`	`39`	`v8::Local<v8::Value> return_value = v8::Null(ctx->isolate);`
`40`	`40`
	`41`	`+#if PHP_VERSION_ID < 80100`
	`42`	`+ if (!(ctx->flags & V8JS_FLAG_PROPAGATE_PHP_EXCEPTIONS) \|\| zend_is_unwind_exit(EG(exception))) {`
	`43`	`+#else`
`41`	`44`	`if (!(ctx->flags & V8JS_FLAG_PROPAGATE_PHP_EXCEPTIONS) \|\| zend_is_graceful_exit(EG(exception)) \|\| zend_is_unwind_exit(EG(exception))) {`
	`45`	`+#endif`
`42`	`46`	`v8js_terminate_execution(ctx->isolate);`
`43`	`47`	`return return_value;`
`44`	`48`	`}`