Skip to content

Commit 21c8bd2

Browse files
committed
Merge pull request #219 from stesie/fix-v8object-passback
Pass back V8Object instances, don't re-wrap
2 parents 90b2b2b + d639430 commit 21c8bd2

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

tests/object_passback_002.phpt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--TEST--
2+
Test V8::executeString() : Object passing JS > PHP > JS
3+
--SKIPIF--
4+
<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
5+
--FILE--
6+
<?php
7+
8+
$v8 = new V8Js();
9+
10+
$v8->theApiCall = function() use ($v8) {
11+
return $v8->executeString('({ foo: 23 })');
12+
};
13+
14+
$v8->executeString('var_dump(PHP.theApiCall().constructor.name);');
15+
16+
?>
17+
===EOF===
18+
--EXPECT--
19+
string(6) "Object"
20+
===EOF===

v8js_object_export.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ v8::Handle<v8::Value> v8js_hash_to_jsobj(zval *value, v8::Isolate *isolate TSRML
988988
}
989989

990990
/* Special case, passing back object originating from JS to JS */
991-
if (ce == php_ce_v8function) {
991+
if (ce == php_ce_v8function || ce == php_ce_v8object) {
992992
v8js_v8object *c = (v8js_v8object *) zend_object_store_get_object(value TSRMLS_CC);
993993

994994
if(isolate != c->ctx->isolate) {

0 commit comments

Comments
 (0)