|
@@ -279,7 +279,7 @@ static void php_v8js_weak_closure_callback(const v8::WeakCallbackData<v8::Object
|
|
!strncasecmp(key, mname, key_len - 1))
|
|
!strncasecmp(key, mname, key_len - 1))
|
|
|
|
|
|
#define PHP_V8JS_CALLBACK(isolate, mptr, tmpl) \
|
|
#define PHP_V8JS_CALLBACK(isolate, mptr, tmpl) \
|
|
- v8::FunctionTemplate::New(php_v8js_php_callback, v8::External::New(isolate, mptr), v8::Signature::New((isolate), tmpl))->GetFunction()
|
|
|
|
|
|
+ v8::FunctionTemplate::New(php_v8js_php_callback, v8::External::New(isolate, mptr), V8JS_NEW(v8::Signature, (isolate), tmpl))->GetFunction()
|
|
|
|
|
|
|
|
|
|
static void php_v8js_named_property_enumerator(const v8::PropertyCallbackInfo<v8::Array> &info) /* {{{ */
|
|
static void php_v8js_named_property_enumerator(const v8::PropertyCallbackInfo<v8::Array> &info) /* {{{ */
|
|
@@ -287,7 +287,7 @@ static void php_v8js_named_property_enumerator(const v8::PropertyCallbackInfo<v8
|
|
// note: 'special' properties like 'constructor' are not enumerated.
|
|
// note: 'special' properties like 'constructor' are not enumerated.
|
|
v8::Isolate *isolate = info.GetIsolate();
|
|
v8::Isolate *isolate = info.GetIsolate();
|
|
v8::Local<v8::Object> self = info.Holder();
|
|
v8::Local<v8::Object> self = info.Holder();
|
|
- v8::Local<v8::Array> result = v8::Array::New(isolate, 0);
|
|
|
|
|
|
+ v8::Local<v8::Array> result = V8JS_NEW(v8::Array, isolate, 0);
|
|
uint32_t result_len = 0;
|
|
uint32_t result_len = 0;
|
|
|
|
|
|
V8JS_TSRMLS_FETCH();
|
|
V8JS_TSRMLS_FETCH();
|
|
@@ -547,7 +547,7 @@ static inline v8::Local<v8::Value> php_v8js_named_property_callback(v8::Local<v8
|
|
v8::Local<v8::Function> cb =
|
|
v8::Local<v8::Function> cb =
|
|
v8::FunctionTemplate::New(
|
|
v8::FunctionTemplate::New(
|
|
php_v8js_fake_call_impl, V8JS_NULL,
|
|
php_v8js_fake_call_impl, V8JS_NULL,
|
|
- v8::Signature::New(isolate, tmpl))->GetFunction();
|
|
|
|
|
|
+ V8JS_NEW(v8::Signature, isolate, tmpl))->GetFunction();
|
|
cb->SetName(property);
|
|
cb->SetName(property);
|
|
ret_value = cb;
|
|
ret_value = cb;
|
|
} else {
|
|
} else {
|
|
@@ -729,7 +729,7 @@ static v8::Handle<v8::Value> php_v8js_hash_to_jsobj(zval *value, v8::Isolate *is
|
|
new_tpl->InstanceTemplate()->SetCallAsFunctionHandler(php_v8js_invoke_callback, PHP_V8JS_CALLBACK(isolate, invoke_method_ptr, new_tpl));
|
|
new_tpl->InstanceTemplate()->SetCallAsFunctionHandler(php_v8js_invoke_callback, PHP_V8JS_CALLBACK(isolate, invoke_method_ptr, new_tpl));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- v8::Local<v8::Array> call_handler_data = v8::Array::New(isolate, 2);
|
|
|
|
|
|
+ v8::Local<v8::Array> call_handler_data = V8JS_NEW(v8::Array, isolate, 2);
|
|
call_handler_data->Set(0, v8::External::New(isolate, persist_tpl_));
|
|
call_handler_data->Set(0, v8::External::New(isolate, persist_tpl_));
|
|
call_handler_data->Set(1, v8::External::New(isolate, ce));
|
|
call_handler_data->Set(1, v8::External::New(isolate, ce));
|
|
new_tpl->SetCallHandler(php_v8js_construct_callback, call_handler_data);
|
|
new_tpl->SetCallHandler(php_v8js_construct_callback, call_handler_data);
|
|
@@ -814,7 +814,7 @@ static v8::Handle<v8::Value> php_v8js_hash_to_jsarr(zval *value, v8::Isolate *is
|
|
return V8JS_NULL;
|
|
return V8JS_NULL;
|
|
}
|
|
}
|
|
|
|
|
|
- newarr = v8::Array::New(isolate, i);
|
|
|
|
|
|
+ newarr = V8JS_NEW(v8::Array, isolate, i);
|
|
|
|
|
|
if (i > 0)
|
|
if (i > 0)
|
|
{
|
|
{
|