Skip to content

Commit ffa42cd

Browse files
stesiestesie
committed
Replaced deprecated v8 api calls with newer equivalents
1 parent 6eeb6fe commit ffa42cd

File tree

5 files changed

+71
-58
lines changed

5 files changed

+71
-58
lines changed

‎php_v8js_macros.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ extern "C" {
5050
#define V8JS_BOOL(v) v8::Boolean::New(v)
5151
#define V8JS_NULL v8::Null()
5252
#define V8JS_MN(name) v8js_method_##name
53-
#define V8JS_METHOD(name) v8::Handle<v8::Value> V8JS_MN(name)(const v8::Arguments& args)
53+
#define V8JS_METHOD(name) void V8JS_MN(name)(const v8::FunctionCallbackInfo<v8::Value>& info)
5454
#define V8JS_THROW(type, message, message_len) v8::ThrowException(v8::Exception::type(V8JS_STRL(message, message_len)))
5555
#define V8JS_GLOBAL v8::Context::GetCurrent()->Global()
5656

‎v8js.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ void php_v8js_create_v8(zval *res, v8::Handle<v8::Value> value, int flags, v8::I
389389

390390
c = (php_v8js_object *) zend_object_store_get_object(res TSRMLS_CC);
391391

392-
c->v8obj = v8::Persistent<v8::Value>::New(value);
392+
c->v8obj = v8::Persistent<v8::Value>::New(isolate, value);
393393
c->flags = flags;
394394
c->isolate = isolate;
395395
}
@@ -587,14 +587,14 @@ static PHP_METHOD(V8Js, __construct)
587587
/* Create global template for global object */
588588
// Now we are using multiple isolates this needs to be created for every context
589589

590-
c->global_template = v8::Persistent<v8::FunctionTemplate>::New(v8::FunctionTemplate::New());
590+
c->global_template = v8::Persistent<v8::FunctionTemplate>::New(c->isolate, v8::FunctionTemplate::New());
591591
c->global_template->SetClassName(V8JS_SYM("V8Js"));
592592

593593
/* Register builtin methods */
594594
php_v8js_register_methods(c->global_template->InstanceTemplate(), c);
595595

596596
/* Create context */
597-
c->context = v8::Persistent<v8::Context>::New(v8::Context::New(c->isolate, &extension_conf, c->global_template->InstanceTemplate()));
597+
c->context = v8::Persistent<v8::Context>::New(c->isolate, v8::Context::New(c->isolate, &extension_conf, c->global_template->InstanceTemplate()));
598598
c->context->SetAlignedPointerInEmbedderData(1, c);
599599

600600
if (exts) {
@@ -632,7 +632,7 @@ static PHP_METHOD(V8Js, __construct)
632632
}
633633

634634
/* Set name for the PHP JS object */
635-
c->object_name = v8::Persistent<v8::String>::New((object_name_len) ? V8JS_SYML(object_name, object_name_len) : V8JS_SYM("PHP"));
635+
c->object_name = v8::Persistent<v8::String>::New(c->isolate, (object_name_len) ? V8JS_SYML(object_name, object_name_len) : V8JS_SYM("PHP"));
636636

637637
/* Add the PHP object into global object */
638638
V8JS_GLOBAL->Set(c->object_name, php_obj_t->InstanceTemplate()->NewInstance(), v8::ReadOnly);

‎v8js_convert.cc‎

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,24 @@ extern "C" {
3434
#include <v8.h>
3535

3636
/* Callback for PHP methods and functions */
37-
static v8::Handle<v8::Value> php_v8js_php_callback(const v8::Arguments &args) /* {{{ */
37+
static void php_v8js_php_callback(const v8::FunctionCallbackInfo<v8::Value>& info) /* {{{ */
3838
{
3939
v8::Handle<v8::Value> return_value;
40-
zval *value = reinterpret_cast<zval *>(args.This()->GetAlignedPointerFromInternalField(0));
41-
v8::Isolate *isolate = reinterpret_cast<v8::Isolate *>(args.This()->GetAlignedPointerFromInternalField(1));
40+
zval *value = reinterpret_cast<zval *>(info.This()->GetAlignedPointerFromInternalField(0));
41+
v8::Isolate *isolate = reinterpret_cast<v8::Isolate *>(info.This()->GetAlignedPointerFromInternalField(1));
4242
zend_function *method_ptr;
4343
zend_fcall_info fci;
4444
zend_fcall_info_cache fcc;
4545
zval fname, *retval_ptr = NULL, **argv = NULL;
4646
TSRMLS_FETCH();
4747
zend_class_entry *ce = Z_OBJCE_P(value);
48-
zend_uint argc = args.Length(), min_num_args = 0, max_num_args = 0;
48+
zend_uint argc = info.Length(), min_num_args = 0, max_num_args = 0;
4949
char *error;
5050
int error_len, i, flags = V8JS_FLAG_NONE;
5151

5252
/* Set method_ptr from v8::External or fetch the closure invoker */
53-
if (!args.Data().IsEmpty() && args.Data()->IsExternal()) {
54-
method_ptr = static_cast<zend_function *>(v8::External::Cast(*args.Data())->Value());
53+
if (!info.Data().IsEmpty() && info.Data()->IsExternal()) {
54+
method_ptr = static_cast<zend_function *>(v8::External::Cast(*info.Data())->Value());
5555
} else {
5656
method_ptr = zend_get_closure_invoke_method(value TSRMLS_CC);
5757
}
@@ -90,7 +90,8 @@ static v8::Handle<v8::Value> php_v8js_php_callback(const v8::Arguments &args) /*
9090
efree(method_ptr);
9191
}
9292
efree(error);
93-
return return_value;
93+
info.GetReturnValue().Set(return_value);
94+
return;
9495
}
9596

9697
/* Convert parameters passed from V8 */
@@ -100,7 +101,7 @@ static v8::Handle<v8::Value> php_v8js_php_callback(const v8::Arguments &args) /*
100101
argv = (zval **) safe_emalloc(argc, sizeof(zval *), 0);
101102
for (i = 0; i < argc; i++) {
102103
MAKE_STD_ZVAL(argv[i]);
103-
if (v8js_to_zval(args[i], argv[i], flags, isolate TSRMLS_CC) == FAILURE) {
104+
if (v8js_to_zval(info[i], argv[i], flags, isolate TSRMLS_CC) == FAILURE) {
104105
fci.param_count++;
105106
error_len = spprintf(&error, 0, "converting parameter #%d passed to %s() failed", i + 1, method_ptr->common.function_name);
106107
return_value = V8JS_THROW(Error, error, error_len);
@@ -141,7 +142,7 @@ static v8::Handle<v8::Value> php_v8js_php_callback(const v8::Arguments &args) /*
141142
return_value = V8JS_NULL;
142143
}
143144

144-
return return_value;
145+
info.GetReturnValue().Set(return_value);
145146
}
146147
/* }}} */
147148

@@ -167,50 +168,53 @@ static int _php_v8js_is_assoc_array(HashTable *myht TSRMLS_DC) /* {{{ */
167168
}
168169
/* }}} */
169170

170-
static v8::Handle<v8::Value> php_v8js_property_caller(const v8::Arguments &args) /* {{{ */
171+
static void php_v8js_property_caller(const v8::FunctionCallbackInfo<v8::Value>& info) /* {{{ */
171172
{
172-
v8::Local<v8::Object> self = args.Holder();
173-
v8::Local<v8::String> cname = args.Callee()->GetName()->ToString();
173+
v8::Local<v8::Object> self = info.Holder();
174+
v8::Local<v8::String> cname = info.Callee()->GetName()->ToString();
174175
v8::Local<v8::Value> value;
175-
v8::Local<v8::String> cb_func = v8::Local<v8::String>::Cast(args.Data());
176+
v8::Local<v8::String> cb_func = v8::Local<v8::String>::Cast(info.Data());
176177

177178
value = self->GetHiddenValue(cb_func);
178179

179180
if (!value.IsEmpty() && value->IsFunction())
180181
{
181-
int argc = args.Length(), i = 0;
182+
int argc = info.Length(), i = 0;
182183
v8::Local<v8::Value> *argv = new v8::Local<v8::Value>[argc];
183184
v8::Local<v8::Function> cb = v8::Local<v8::Function>::Cast(value);
184185

185186
if (cb_func->Equals(V8JS_SYM(ZEND_INVOKE_FUNC_NAME))) {
186187
for (; i < argc; ++i) {
187-
argv[i] = args[i];
188+
argv[i] = info[i];
188189
}
189190
value = cb->Call(self, argc, argv);
190191
}
191192
else /* __call() */
192193
{
193194
v8::Local<v8::Array> argsarr = v8::Array::New(argc);
194195
for (; i < argc; ++i) {
195-
argsarr->Set(i, args[i]);
196+
argsarr->Set(i, info[i]);
196197
}
197198
v8::Local<v8::Value> argsv[2] = { cname, argsarr };
198199
value = cb->Call(self, 2, argsv);
199200
}
200201
}
201202

202-
if (args.IsConstructCall()) {
203+
if (info.IsConstructCall()) {
203204
if (!value.IsEmpty() && !value->IsNull()) {
204-
return value;
205+
info.GetReturnValue().Set(value);
206+
return;
205207
}
206-
return self;
208+
209+
info.GetReturnValue().Set(self);
210+
return;
207211
}
208212

209-
return value;
213+
info.GetReturnValue().Set(value);
210214
}
211215
/* }}} */
212216

213-
static v8::Handle<v8::Value> php_v8js_property_getter(v8::Local<v8::String> property, const v8::AccessorInfo &info) /* {{{ */
217+
static void php_v8js_property_getter(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value> &info) /* {{{ */
214218
{
215219
v8::Local<v8::Object> self = info.Holder();
216220
v8::Local<v8::Value> value;
@@ -220,7 +224,8 @@ static v8::Handle<v8::Value> php_v8js_property_getter(v8::Local<v8::String> prop
220224
value = self->GetRealNamedProperty(property);
221225

222226
if (!value.IsEmpty()) {
223-
return value;
227+
info.GetReturnValue().Set(value);
228+
return;
224229
}
225230

226231
/* If __get() is set for PHP object, call it */
@@ -236,21 +241,23 @@ static v8::Handle<v8::Value> php_v8js_property_getter(v8::Local<v8::String> prop
236241
v8::Local<v8::FunctionTemplate> cb_t = v8::FunctionTemplate::New(php_v8js_property_caller, V8JS_SYM(ZEND_CALL_FUNC_NAME));
237242
cb = cb_t->GetFunction();
238243
cb->SetName(property);
239-
return cb;
244+
info.GetReturnValue().Set(cb);
245+
return;
240246
}
241247

242-
return value;
248+
info.GetReturnValue().Set(value);
243249
}
244250
/* }}} */
245251

246-
static v8::Handle<v8::Integer> php_v8js_property_query(v8::Local<v8::String> property, const v8::AccessorInfo &info) /* {{{ */
252+
static void php_v8js_property_query(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Integer> &info) /* {{{ */
247253
{
248254
v8::Local<v8::Object> self = info.Holder();
249255
v8::Local<v8::Value> value;
250256

251257
/* Return early if property is set in JS object */
252258
if (self->HasRealNamedProperty(property)) {
253-
return V8JS_INT(v8::ReadOnly);
259+
info.GetReturnValue().Set(V8JS_INT(v8::ReadOnly));
260+
return;
254261
}
255262

256263
value = self->GetHiddenValue(V8JS_SYM(ZEND_ISSET_FUNC_NAME));
@@ -260,7 +267,7 @@ static v8::Handle<v8::Integer> php_v8js_property_query(v8::Local<v8::String> pro
260267
value = cb->Call(self, 1, argv);
261268
}
262269

263-
return (!value.IsEmpty() && value->IsTrue()) ? V8JS_INT(v8::ReadOnly) : v8::Local<v8::Integer>();
270+
info.GetReturnValue().Set((!value.IsEmpty() && value->IsTrue()) ? V8JS_INT(v8::ReadOnly) : v8::Local<v8::Integer>());
264271
}
265272
/* }}} */
266273

‎v8js_methods.cc‎

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,13 @@ void php_v8js_commonjs_normalise_identifier(char *base, char *identifier, char *
3636
V8JS_METHOD(exit) /* {{{ */
3737
{
3838
v8::V8::TerminateExecution();
39-
return v8::Undefined();
4039
}
4140
/* }}} */
4241

4342
/* global.sleep - sleep for passed seconds */
4443
V8JS_METHOD(sleep) /* {{{ */
4544
{
46-
php_sleep(args[0]->Int32Value());
47-
return v8::Undefined();
45+
php_sleep(info[0]->Int32Value());
4846
}
4947
/* }}} */
5048

@@ -54,12 +52,12 @@ V8JS_METHOD(print) /* {{{ */
5452
int ret = 0;
5553
TSRMLS_FETCH();
5654

57-
for (int i = 0; i < args.Length(); i++) {
58-
v8::String::Utf8Value str(args[i]);
55+
for (int i = 0; i < info.Length(); i++) {
56+
v8::String::Utf8Value str(info[i]);
5957
const char *cstr = ToCString(str);
6058
ret = PHPWRITE(cstr, strlen(cstr));
6159
}
62-
return V8JS_INT(ret);
60+
info.GetReturnValue().Set(V8JS_INT(ret));
6361
}
6462
/* }}} */
6563

@@ -161,26 +159,27 @@ V8JS_METHOD(var_dump) /* {{{ */
161159
int i;
162160
TSRMLS_FETCH();
163161

164-
for (int i = 0; i < args.Length(); i++) {
165-
_php_v8js_dumper(args[i], 1 TSRMLS_CC);
162+
for (int i = 0; i < info.Length(); i++) {
163+
_php_v8js_dumper(info[i], 1 TSRMLS_CC);
166164
}
167165

168-
return V8JS_NULL;
166+
info.GetReturnValue().Set(V8JS_NULL);
169167
}
170168
/* }}} */
171169

172170
V8JS_METHOD(require)
173171
{
174172
// Get the extension context
175-
v8::Handle<v8::External> data = v8::Handle<v8::External>::Cast(args.Data());
173+
v8::Handle<v8::External> data = v8::Handle<v8::External>::Cast(info.Data());
176174
php_v8js_ctx *c = static_cast<php_v8js_ctx*>(data->Value());
177175

178176
// Check that we have a module loader
179177
if (c->module_loader == NULL) {
180-
return v8::ThrowException(v8::String::New("No module loader"));
178+
info.GetReturnValue().Set(v8::ThrowException(v8::String::New("No module loader")));
179+
return;
181180
}
182181

183-
v8::String::Utf8Value module_id_v8(args[0]);
182+
v8::String::Utf8Value module_id_v8(info[0]);
184183

185184
// Make sure to duplicate the module name string so it doesn't get freed by the V8 garbage collector
186185
char *module_id = estrdup(ToCString(module_id_v8));
@@ -207,15 +206,17 @@ V8JS_METHOD(require)
207206
if (!strcmp(*it, normalised_module_id)) {
208207
efree(normalised_path);
209208

210-
return v8::ThrowException(v8::String::New("Module cyclic dependency"));
209+
info.GetReturnValue().Set(v8::ThrowException(v8::String::New("Module cyclic dependency")));
210+
return;
211211
}
212212
}
213213

214214
// If we have already loaded and cached this module then use it
215215
if (V8JSG(modules_loaded).count(normalised_module_id) > 0) {
216216
efree(normalised_path);
217217

218-
return V8JSG(modules_loaded)[normalised_module_id];
218+
info.GetReturnValue().Set(V8JSG(modules_loaded)[normalised_module_id]);
219+
return;
219220
}
220221

221222
// Callback to PHP to load the module code
@@ -230,7 +231,8 @@ V8JS_METHOD(require)
230231
if (FAILURE == call_user_function(EG(function_table), NULL, c->module_loader, &module_code, 1, params TSRMLS_CC)) {
231232
efree(normalised_path);
232233

233-
return v8::ThrowException(v8::String::New("Module loader callback failed"));
234+
info.GetReturnValue().Set(v8::ThrowException(v8::String::New("Module loader callback failed")));
235+
return;
234236
}
235237

236238
// Check if an exception was thrown
@@ -239,7 +241,8 @@ V8JS_METHOD(require)
239241

240242
// Clear the PHP exception and throw it in V8 instead
241243
zend_clear_exception(TSRMLS_CC);
242-
return v8::ThrowException(v8::String::New("Module loader callback exception"));
244+
info.GetReturnValue().Set(v8::ThrowException(v8::String::New("Module loader callback exception")));
245+
return;
243246
}
244247

245248
// Convert the return value to string
@@ -251,7 +254,8 @@ V8JS_METHOD(require)
251254
if (!strlen(Z_STRVAL(module_code))) {
252255
efree(normalised_path);
253256

254-
return v8::ThrowException(v8::String::New("Module loader callback did not return code"));
257+
info.GetReturnValue().Set(v8::ThrowException(v8::String::New("Module loader callback did not return code")));
258+
return;
255259
}
256260

257261
// Create a template for the global object and set the built-in global functions
@@ -272,7 +276,7 @@ V8JS_METHOD(require)
272276
global->Set(v8::String::New("module"), module);
273277

274278
// Each module gets its own context so different modules do not affect each other
275-
v8::Persistent<v8::Context> context = v8::Persistent<v8::Context>::New(v8::Context::New(c->isolate, NULL, global));
279+
v8::Persistent<v8::Context> context = v8::Persistent<v8::Context>::New(c->isolate, v8::Context::New(c->isolate, NULL, global));
276280

277281
// Catch JS exceptions
278282
v8::TryCatch try_catch;
@@ -295,7 +299,8 @@ V8JS_METHOD(require)
295299
// The script will be empty if there are compile errors
296300
if (script.IsEmpty()) {
297301
efree(normalised_path);
298-
return v8::ThrowException(v8::String::New("Module script compile failed"));
302+
info.GetReturnValue().Set(v8::ThrowException(v8::String::New("Module script compile failed")));
303+
return;
299304
}
300305

301306
// Add this module and path to the stack
@@ -314,13 +319,15 @@ V8JS_METHOD(require)
314319

315320
// Script possibly terminated, return immediately
316321
if (!try_catch.CanContinue()) {
317-
return v8::ThrowException(v8::String::New("Module script compile failed"));
322+
info.GetReturnValue().Set(v8::ThrowException(v8::String::New("Module script compile failed")));
323+
return;
318324
}
319325

320326
// Handle runtime JS exceptions
321327
if (try_catch.HasCaught()) {
322328
// Rethrow the exception back to JS
323-
return try_catch.ReThrow();
329+
info.GetReturnValue().Set(try_catch.ReThrow());
330+
return;
324331
}
325332

326333
// Cache the module so it doesn't need to be compiled and run again
@@ -333,7 +340,7 @@ V8JS_METHOD(require)
333340
V8JSG(modules_loaded)[normalised_module_id] = handle_scope.Close(exports);
334341
}
335342

336-
return V8JSG(modules_loaded)[normalised_module_id];
343+
info.GetReturnValue().Set(V8JSG(modules_loaded)[normalised_module_id]);
337344
}
338345

339346
void php_v8js_register_methods(v8::Handle<v8::ObjectTemplate> global, php_v8js_ctx *c) /* {{{ */

0 commit comments

Comments
 (0)