Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Php8 propagate exception magic methods #509

Merged
merged 2 commits into from
Feb 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions tests/php_exceptions_007.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
--TEST--
Test V8::executeString() : PHP Exception handling (throwed inside magic method)
--SKIPIF--
<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
--FILE--
<?php
class SomeClass {
function someMethod($someVariable) {
return $someVariable;
}

public function triggerException() {
throw new Exception("Some exception");
}

public function __get($key) {
$this->triggerException();
}
}

function execute($code, $flags = V8Js::FLAG_NONE) {
$js = new V8Js();
$js->output = new stdClass();
$js->SomeClassInstance = new SomeClass();
try {
$js->executeString("
try {
$code
} catch(e) {
PHP.output.result = 'Caught exception at javascript level : ' + e.getMessage();
}
", '', $flags);
print($js->output->result.PHP_EOL);
} catch (Exception $e) {
print( "Caught exception at php level : ".$e->getMessage().PHP_EOL);
}
}

execute("PHP.SomeClassInstance.triggerException();");
execute("PHP.SomeClassInstance.someMethod(PHP.SomeClassInstance.TriggerMagicMethod);");
execute("PHP.SomeClassInstance.TriggerMagicMethod;");
execute("PHP.SomeClassInstance.triggerException();", V8Js::FLAG_PROPAGATE_PHP_EXCEPTIONS);
execute("PHP.SomeClassInstance.someMethod(PHP.SomeClassInstance.TriggerMagicMethod);", V8Js::FLAG_PROPAGATE_PHP_EXCEPTIONS);
execute("PHP.SomeClassInstance.TriggerMagicMethod;", V8Js::FLAG_PROPAGATE_PHP_EXCEPTIONS);
?>
===EOF===
--EXPECTF--
Caught exception at php level : Some exception
Caught exception at php level : Some exception
Caught exception at php level : Some exception
Caught exception at javascript level : Some exception
Caught exception at javascript level : Some exception
Caught exception at javascript level : Some exception
===EOF===
10 changes: 6 additions & 4 deletions v8js_object_export.cc
Original file line number Diff line number Diff line change
Expand Up @@ -765,10 +765,12 @@ v8::Local<v8::Value> v8js_named_property_callback(v8::Local<v8::Name> property_n
(property_info != ZEND_WRONG_PROPERTY_INFO &&
property_info->flags & ZEND_ACC_PUBLIC)) {
zval *property_val = zend_read_property(NULL, &zobject, name, name_len, true, &php_value);
// special case uninitialized_zval_ptr and return an empty value
// (indicating that we don't intercept this property) if the
// property doesn't exist.
if (property_val == &EG(uninitialized_zval)) {
if(EG(exception)) {
ret_value = v8js_propagate_exception(ctx);
} else if (property_val == &EG(uninitialized_zval)) {
// special case uninitialized_zval_ptr and return an empty value
// (indicating that we don't intercept this property) if the
// property doesn't exist.
ret_value = v8::Local<v8::Value>();
} else {
// wrap it
Expand Down