mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2024-12-22 08:11:52 +00:00
Code Releases Activity

Merge remote-tracking branch 'stesie/require-exception-handling' into php7

Browse Source
This commit is contained in:
Stefan Siegl 2017-11-26 12:24:46 +01:00
commit b12a2fb4e3
No known key found for this signature in database
GPG Key ID: 73942AF5642F3DDA
3 changed files with 90 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/commonjs_exception_001.phpt Normal file
View File

@ -0,0 +1,35 @@
--TEST--
Test V8Js::setModuleLoader : Forward exceptions
--SKIPIF--
<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
--FILE--
<?php
$JS = <<< EOT
var foo = require("./test");
EOT;
$v8 = new V8Js();
$v8->setModuleLoader(function($module) {
throw new Exception('some exception');
});
$v8->executeString($JS, 'module.js', V8Js::FLAG_PROPAGATE_PHP_EXCEPTIONS);
?>
===EOF===
--EXPECTF--
Fatal error: Uncaught Exception: some exception in %s%ecommonjs_exception_001.php:9
Stack trace:
#0 [internal function]: {closure}('test')
#1 %s%ecommonjs_exception_001.php(12): V8Js->executeString('var foo = requi...', 'module.js', 4)
#2 {main}
Next V8JsScriptException: module.js:1: Exception: some exception in %s%ecommonjs_exception_001.php:9
Stack trace:
#0 [internal function]: {closure}('test')
#1 %s%ecommonjs_exception_001.php(12): V8Js->executeString('var foo = requi...', 'module.js', 4)
#2 {main} in %s%ecommonjs_exception_001.php:12
Stack trace:
#0 %s%ecommonjs_exception_001.php(12): V8Js->executeString('var foo = requi...', 'module.js', 4)
#1 {main}
thrown in %s%ecommonjs_exception_001.php on line 12

38
tests/commonjs_exception_002.phpt Normal file
View File

@ -0,0 +1,38 @@
--TEST--
Test V8Js::setModuleNormaliser : Forward exceptions
--SKIPIF--
<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
--FILE--
<?php
$JS = <<< EOT
var foo = require("./test");
EOT;
$v8 = new V8Js();
$v8->setModuleNormaliser(function($module) {
throw new Exception('some exception');
});
$v8->setModuleLoader(function($module) {
echo 'dummy ...';
});
$v8->executeString($JS, 'module.js', V8Js::FLAG_PROPAGATE_PHP_EXCEPTIONS);
?>
===EOF===
--EXPECTF--
Fatal error: Uncaught Exception: some exception in %s%ecommonjs_exception_002.php:9
Stack trace:
#0 [internal function]: {closure}('', './test')
#1 %s%ecommonjs_exception_002.php(15): V8Js->executeString('var foo = requi...', 'module.js', 4)
#2 {main}
Next V8JsScriptException: module.js:1: Exception: some exception in %s%ecommonjs_exception_002.php:9
Stack trace:
#0 [internal function]: {closure}('', './test')
#1 %s%ecommonjs_exception_002.php(15): V8Js->executeString('var foo = requi...', 'module.js', 4)
#2 {main} in %s%ecommonjs_exception_002.php:15
Stack trace:
#0 %s%ecommonjs_exception_002.php(15): V8Js->executeString('var foo = requi...', 'module.js', 4)
#1 {main}
thrown in %s%ecommonjs_exception_002.php on line 15

23
v8js_methods.cc
View File

@ -267,9 +267,14 @@ V8JS_METHOD(require)
// Check if an exception was thrown
if (EG(exception)) {
// Clear the PHP exception and throw it in V8 instead
zend_clear_exception();
info.GetReturnValue().Set(isolate->ThrowException(V8JS_SYM("Module normaliser callback exception")));
if (c->flags & V8JS_FLAG_PROPAGATE_PHP_EXCEPTIONS) {
zval tmp_zv;
ZVAL_OBJ(&tmp_zv, EG(exception));
info.GetReturnValue().Set(isolate->ThrowException(zval_to_v8js(&tmp_zv, isolate)));
zend_clear_exception();
} else {
v8js_terminate_execution(isolate);
}
return;
}
@ -389,9 +394,15 @@ V8JS_METHOD(require)
efree(normalised_module_id);
efree(normalised_path);
// Clear the PHP exception and throw it in V8 instead
zend_clear_exception();
info.GetReturnValue().Set(isolate->ThrowException(V8JS_SYM("Module loader callback exception")));
if (c->flags & V8JS_FLAG_PROPAGATE_PHP_EXCEPTIONS) {
zval tmp_zv;
ZVAL_OBJ(&tmp_zv, EG(exception));
info.GetReturnValue().Set(isolate->ThrowException(zval_to_v8js(&tmp_zv, isolate)));
zend_clear_exception();
} else {
v8js_terminate_execution(isolate);
}
return;
}