mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2024-12-23 04:51:53 +00:00
Code Releases Activity

GetConstructor method was removed, use GetConstructorName and instanciate on our own

Browse Source
This commit is contained in:
Stefan Siegl 2014-08-10 13:36:54 +02:00
parent 137a6732c6
commit 9ead20823f
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
v8js_convert.cc
View File

@ -482,6 +482,7 @@ static void php_v8js_named_property_enumerator(const v8::PropertyCallbackInfo<v8
static void php_v8js_invoke_callback(const v8::FunctionCallbackInfo<v8::Value>& info) /* {{{ */ static void php_v8js_invoke_callback(const v8::FunctionCallbackInfo<v8::Value>& info) /* {{{ */
{ {
v8::Isolate *isolate = info.GetIsolate();
v8::Local<v8::Object> self = info.Holder(); v8::Local<v8::Object> self = info.Holder();
v8::Local<v8::Function> cb = v8::Local<v8::Function>::Cast(info.Data()); v8::Local<v8::Function> cb = v8::Local<v8::Function>::Cast(info.Data());
int argc = info.Length(), i; int argc = info.Length(), i;
@ -491,11 +492,24 @@ static void php_v8js_invoke_callback(const v8::FunctionCallbackInfo<v8::Value>&
for (i=0; i<argc; i++) { for (i=0; i<argc; i++) {
argv[i] = info[i]; argv[i] = info[i];
} }
if (info.IsConstructCall() && self->GetConstructor()->IsFunction()) {
// this is a 'new obj(...)' invocation. Handle this like PHP does; if (info.IsConstructCall()) {
// that is, treat it as synonymous with 'new obj.constructor(...)' #if PHP_V8_API_VERSION <= 3023008
cb = v8::Local<v8::Function>::Cast(self->GetConstructor()); /* Until V8 3.23.8 Isolate could only take one external pointer. */
result = cb->NewInstance(argc, argv); php_v8js_ctx *ctx = (php_v8js_ctx *) isolate->GetData();
#else
php_v8js_ctx *ctx = (php_v8js_ctx *) isolate->GetData(0);
#endif
v8::String::Utf8Value str(self->GetConstructorName()->ToString());
const char *constructor_name = ToCString(str);
zend_class_entry *ce = zend_fetch_class_by_name(constructor_name, str.length(), NULL, 0);
v8::Local<v8::FunctionTemplate> new_tpl;
new_tpl = v8::Local<v8::FunctionTemplate>::New
(isolate, ctx->template_cache.at(ce->name));
result = new_tpl->GetFunction()->NewInstance(argc, argv);
} else { } else {
result = cb->Call(self, argc, argv); result = cb->Call(self, argc, argv);
} }