Skip to content
This repository was archived by the owner on Mar 29, 2024. It is now read-only.

Commit dc12f46

Browse files
committed
Fix deprecated v8 api calls
1 parent 157f3b9 commit dc12f46

File tree

7 files changed

+16
-14
lines changed

7 files changed

+16
-14
lines changed

src/php_v8_date.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ static PHP_METHOD(V8Date, __construct) {
4141

4242
PHP_V8_OBJECT_CONSTRUCT(getThis(), php_v8_context_zv, php_v8_context, php_v8_value);
4343

44-
v8::Local<v8::Date> local_date = v8::Date::New(isolate, time).As<v8::Date>();
44+
v8::MaybeLocal<v8::Value> maybe_local_date = v8::Date::New(context, time);
4545

46-
PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(local_date, "Failed to create Date value");
46+
PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(maybe_local_date, "Failed to create Date value");
47+
48+
v8::Local<v8::Date> local_date = maybe_local_date.ToLocalChecked().As<v8::Date>();
4749

4850
ZVAL_COPY_VALUE(&php_v8_value->this_ptr, getThis());
4951
php_v8_object_store_self_ptr(isolate, local_date, php_v8_value);

src/php_v8_function.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ static PHP_METHOD(V8Function, GetScriptOrigin) {
417417

418418
v8::ScriptOrigin script_origin = local_function->GetScriptOrigin();
419419

420-
php_v8_create_script_origin(return_value, script_origin);
420+
php_v8_create_script_origin(return_value, context, script_origin);
421421
}
422422

423423

src/php_v8_message.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void php_v8_message_create_from_message(zval *return_value, php_v8_isolate_t *ph
5050

5151
/* v8::Message::GetScriptOrigin */
5252
zval origin_zv;
53-
php_v8_create_script_origin(&origin_zv, message->GetScriptOrigin());
53+
php_v8_create_script_origin(&origin_zv, context, message->GetScriptOrigin());
5454
zend_update_property(this_ce, return_value, ZEND_STRL("script_origin"), &origin_zv);
5555
zval_ptr_dtor(&origin_zv);
5656

src/php_v8_script.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static PHP_METHOD(V8Script, __construct)
103103
origin = new v8::ScriptOrigin(v8::Undefined(isolate));
104104

105105
zval origin_zv;
106-
php_v8_create_script_origin(&origin_zv, *origin);
106+
php_v8_create_script_origin(&origin_zv, context, *origin);
107107
zend_update_property(this_ce, getThis(), ZEND_STRL("origin"), &origin_zv);
108108

109109
zval_ptr_dtor(&origin_zv);

src/php_v8_script_origin.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ zend_class_entry *php_v8_script_origin_class_entry;
2525
#define this_ce php_v8_script_origin_class_entry
2626

2727

28-
extern void php_v8_create_script_origin(zval *return_value, v8::ScriptOrigin origin) {
28+
extern void php_v8_create_script_origin(zval *return_value, v8::Local<v8::Context> context, v8::ScriptOrigin origin) {
2929
zval options_zv;
3030

3131
object_init_ex(return_value, this_ce);
@@ -38,13 +38,13 @@ extern void php_v8_create_script_origin(zval *return_value, v8::ScriptOrigin ori
3838
}
3939

4040
/* v8::SourceMapUrl::ResourceLineOffset */
41-
if (!origin.ResourceLineOffset().IsEmpty()) {
42-
zend_update_property_long(this_ce, return_value, ZEND_STRL("resource_line_offset"), static_cast<zend_long>(origin.ResourceLineOffset()->NumberValue()));
41+
if (!origin.ResourceLineOffset().IsEmpty() && origin.ResourceLineOffset()->NumberValue(context).IsJust()) {
42+
zend_update_property_long(this_ce, return_value, ZEND_STRL("resource_line_offset"), static_cast<zend_long>(origin.ResourceLineOffset()->NumberValue(context).FromJust()));
4343
}
4444

4545
/* v8::SourceMapUrl::ResourceColumnOffset */
46-
if (!origin.ResourceColumnOffset().IsEmpty()) {
47-
zend_update_property_long(this_ce, return_value, ZEND_STRL("resource_column_offset"), static_cast<zend_long>(origin.ResourceColumnOffset()->NumberValue()));
46+
if (!origin.ResourceColumnOffset().IsEmpty() && origin.ResourceColumnOffset()->NumberValue(context).IsJust()) {
47+
zend_update_property_long(this_ce, return_value, ZEND_STRL("resource_column_offset"), static_cast<zend_long>(origin.ResourceColumnOffset()->NumberValue(context).FromJust()));
4848
}
4949

5050
/* v8::SourceMapUrl::Options */
@@ -53,8 +53,8 @@ extern void php_v8_create_script_origin(zval *return_value, v8::ScriptOrigin ori
5353
zval_ptr_dtor(&options_zv);
5454

5555
/* v8::SourceMapUrl::ScriptID */
56-
if (!origin.ScriptID().IsEmpty()) {
57-
zend_update_property_long(this_ce, return_value, ZEND_STRL("script_id"), static_cast<zend_long>(origin.ScriptID()->NumberValue()));
56+
if (!origin.ScriptID().IsEmpty() && origin.ScriptID()->NumberValue(context).IsJust()) {
57+
zend_update_property_long(this_ce, return_value, ZEND_STRL("script_id"), static_cast<zend_long>(origin.ScriptID()->NumberValue(context).FromJust()));
5858
}
5959

6060
/* v8::SourceMapUrl::ResourceName */

src/php_v8_script_origin.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ extern "C" {
2727

2828
extern zend_class_entry* php_v8_script_origin_class_entry;
2929

30-
extern void php_v8_create_script_origin(zval * return_value, v8::ScriptOrigin origin);
30+
extern void php_v8_create_script_origin(zval * return_value, v8::Local<v8::Context> context, v8::ScriptOrigin origin);
3131
extern v8::ScriptOrigin *php_v8_create_script_origin_from_zval(zval *value, v8::Isolate *isolate);
3232

3333
PHP_MINIT_FUNCTION (php_v8_script_origin);

src/php_v8_value.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ static PHP_METHOD(V8Value, ToString) {
678678
PHP_V8_TRY_CATCH(isolate);
679679
PHP_V8_INIT_ISOLATE_LIMITS_ON_CONTEXT(php_v8_context);
680680

681-
v8::MaybeLocal<v8::String> maybe_local = php_v8_value_get_value_local(isolate, php_v8_value)->ToString(isolate);
681+
v8::MaybeLocal<v8::String> maybe_local = php_v8_value_get_value_local(isolate, php_v8_value)->ToString(context);
682682

683683
PHP_V8_MAYBE_CATCH(php_v8_context, try_catch);
684684
PHP_V8_THROW_EXCEPTION_WHEN_EMPTY(maybe_local, "Failed to convert");

0 commit comments

Comments
 (0)