Merge pull request #3 from pinepain/upgrades

Remove deprecated v8 API calls

Author: pinepain

CMakeLists.txt

@@ -11,6 +11,7 @@ include_directories(/usr/local/include/php/main)
 include_directories(/usr/local/include/php/sapi)
 
 add_definitions(-DV8_DEPRECATION_WARNINGS)
+add_definitions(-DV8_IMMINENT_DEPRECATION_WARNINGS)
 
 if(EXISTS "${CMAKE_SOURCE_DIR}/config.h")
     add_definitions(-DHAVE_CONFIG_H)

config.m4

@@ -144,6 +144,7 @@ if test "$PHP_V8" != "no"; then
   ac_cv_suppress_register_warnings_flag="-Wno-deprecated-register"
 
   AC_DEFINE([V8_DEPRECATION_WARNINGS], [1], [Enable compiler warnings when using V8_DEPRECATED apis.])
+  AC_DEFINE([V8_IMMINENT_DEPRECATION_WARNINGS], [1], [Enable compiler warnings to make it easier to see what v8 apis will be deprecated (V8_DEPRECATED) soon.])
 
   AC_LANG_RESTORE
   LIBS=$old_LIBS

src/php_v8_a.cc

@@ -29,7 +29,6 @@ void php_v8_init()
         return;
     }
 
-    v8::V8::InitializeICU(); // TODO: check whether we actually initialized it
     // NOTE: if we use snapshot and extenal startup data then we have to initialize it (see https://codereview.chromium.org/315033002/)
     // v8::V8::InitializeExternalStartupData(NULL);
     v8::Platform *platform = v8::platform::CreateDefaultPlatform();

src/php_v8_date.cc

@@ -41,9 +41,11 @@ static PHP_METHOD(V8Date, __construct) {
 
     PHP_V8_OBJECT_CONSTRUCT(getThis(), php_v8_context_zv, php_v8_context, php_v8_value);
 
-    v8::Local<v8::Date> local_date = v8::Date::New(isolate, time).As<v8::Date>();
+    v8::MaybeLocal<v8::Value> maybe_local_date = v8::Date::New(context, time);
 
-    PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(local_date, "Failed to create Date value");
+    PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(maybe_local_date, "Failed to create Date value");
+
+    v8::Local<v8::Date> local_date = maybe_local_date.ToLocalChecked().As<v8::Date>();
 
     ZVAL_COPY_VALUE(&php_v8_value->this_ptr, getThis());
     php_v8_object_store_self_ptr(isolate, local_date, php_v8_value);

src/php_v8_function.cc

@@ -417,7 +417,7 @@ static PHP_METHOD(V8Function, GetScriptOrigin) {
 
     v8::ScriptOrigin script_origin = local_function->GetScriptOrigin();
 
-    php_v8_create_script_origin(return_value, script_origin);
+    php_v8_create_script_origin(return_value, context, script_origin);
 }
 
 

src/php_v8_isolate.cc

@@ -161,11 +161,11 @@ static void php_v8_isolate_free(zend_object *object) {
 
     zend_object_std_dtor(&php_v8_isolate->std);
 
-    if (php_v8_isolate->array_buffer_allocator) {
-        delete php_v8_isolate->array_buffer_allocator;
-    }
-
     if (php_v8_isolate->create_params) {
+        if (php_v8_isolate->create_params->array_buffer_allocator) {
+            delete php_v8_isolate->create_params->array_buffer_allocator;
+        }
+
         delete php_v8_isolate->create_params;
     }
 }
@@ -182,10 +182,8 @@ static zend_object *php_v8_isolate_ctor(zend_class_entry *ce) {
     // TODO: inline? module init?
     php_v8_init();
 
-    php_v8_isolate->array_buffer_allocator = new ArrayBufferAllocator();
     php_v8_isolate->create_params = new v8::Isolate::CreateParams();
-
-    php_v8_isolate->create_params->array_buffer_allocator = php_v8_isolate->array_buffer_allocator;
+    php_v8_isolate->create_params->array_buffer_allocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator();
 
     php_v8_isolate->weak_function_templates = new std::map<v8::Persistent<v8::FunctionTemplate> *, php_v8_callbacks_t *>();
     php_v8_isolate->weak_object_templates = new std::map<v8::Persistent<v8::ObjectTemplate> *, php_v8_callbacks_t *>();

src/php_v8_isolate.h

@@ -117,19 +117,8 @@ extern php_v8_isolate_t * php_v8_isolate_fetch_object(zend_object *obj);
     }                                               \
 
 
-class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
-public:
-    virtual void* Allocate(size_t length) {
-        void* data = AllocateUninitialized(length);
-        return data == NULL ? data : memset(data, 0, length);
-    }
-    virtual void* AllocateUninitialized(size_t length) { return malloc(length); }
-    virtual void Free(void* data, size_t) { free(data); }
-};
-
 struct _php_v8_isolate_t {
     v8::Isolate *isolate;
-    ArrayBufferAllocator *array_buffer_allocator;
     v8::Isolate::CreateParams *create_params;
 
     std::map<v8::Persistent<v8::FunctionTemplate>*, php_v8_callbacks_t *> *weak_function_templates;

src/php_v8_message.cc

@@ -50,7 +50,7 @@ void php_v8_message_create_from_message(zval *return_value, php_v8_isolate_t *ph
 
     /* v8::Message::GetScriptOrigin */
     zval origin_zv;
-    php_v8_create_script_origin(&origin_zv, message->GetScriptOrigin());
+    php_v8_create_script_origin(&origin_zv, context, message->GetScriptOrigin());
     zend_update_property(this_ce, return_value, ZEND_STRL("script_origin"), &origin_zv);
     zval_ptr_dtor(&origin_zv);
 

src/php_v8_object.cc

@@ -243,12 +243,83 @@ static PHP_METHOD(V8Object, SetIndex) {
     RETURN_BOOL(maybe_res.FromJust());
 }
 
-static PHP_METHOD(V8Object, ForceSet) {
+static PHP_METHOD(V8Object, CreateDataProperty) {
+    zval *php_v8_context_zv;
+    zval *php_v8_key_or_index_zv;
+    zval *php_v8_value_zv;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "ooo", &php_v8_context_zv, &php_v8_key_or_index_zv, &php_v8_value_zv) == FAILURE) {
+        return;
+    }
+
+    PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value);
+    PHP_V8_VALUE_FETCH_WITH_CHECK(php_v8_key_or_index_zv, php_v8_key_or_index);
+    PHP_V8_VALUE_FETCH_WITH_CHECK(php_v8_value_zv, php_v8_value_value_to_set);
+    PHP_V8_CONTEXT_FETCH_WITH_CHECK(php_v8_context_zv, php_v8_context);
+
+    PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_context);
+    PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_key_or_index);
+    PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_value_value_to_set);
+
+    PHP_V8_ENTER_STORED_ISOLATE(php_v8_value);
+    PHP_V8_ENTER_CONTEXT(php_v8_context);
+
+    v8::Local<v8::Object> local_obj = php_v8_value_get_object_local(isolate, php_v8_value);
+    v8::Local<v8::Name> local_key_or_index = php_v8_value_get_name_local(isolate, php_v8_key_or_index);
+    v8::Local<v8::Value> local_value_to_set = php_v8_value_get_value_local(isolate, php_v8_value_value_to_set);
+
+    PHP_V8_TRY_CATCH(isolate);
+    PHP_V8_INIT_ISOLATE_LIMITS_ON_OBJECT_VALUE(php_v8_value);
+
+    v8::Maybe<bool> maybe_res = local_obj->CreateDataProperty(context, local_key_or_index, local_value_to_set);
+
+    PHP_V8_MAYBE_CATCH(php_v8_context, try_catch);
+    PHP_V8_THROW_EXCEPTION_WHEN_NOTHING(maybe_res, "Failed to create data property");
+
+    RETURN_BOOL(maybe_res.FromJust());
+}
+
+static PHP_METHOD(V8Object, CreateDataPropertyIndex) {
+    zval *php_v8_context_zv;
+    zend_long index;
+    zval *php_v8_value_zv;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "olo", &php_v8_context_zv, &index, &php_v8_value_zv) == FAILURE) {
+        return;
+    }
+
+    PHP_V8_CHECK_UINT32_RANGE(index, "Index is out of range (should be valid uint32 value)");
+
+    PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value);
+    PHP_V8_VALUE_FETCH_WITH_CHECK(php_v8_value_zv, php_v8_value_value_to_set);
+    PHP_V8_CONTEXT_FETCH_WITH_CHECK(php_v8_context_zv, php_v8_context);
+
+    PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_context);
+    PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_value_value_to_set);
+
+    PHP_V8_ENTER_STORED_ISOLATE(php_v8_value);
+    PHP_V8_ENTER_CONTEXT(php_v8_context);
+
+    v8::Local<v8::Object> local_obj = php_v8_value_get_object_local(isolate, php_v8_value);
+    v8::Local<v8::Value> local_value_to_set = php_v8_value_get_value_local(isolate, php_v8_value_value_to_set);
+
+    PHP_V8_TRY_CATCH(isolate);
+    PHP_V8_INIT_ISOLATE_LIMITS_ON_OBJECT_VALUE(php_v8_value);
+
+    v8::Maybe<bool> maybe_res = local_obj->CreateDataProperty(context, static_cast<uint32_t>(index), local_value_to_set);
+
+    PHP_V8_MAYBE_CATCH(php_v8_context, try_catch);
+    PHP_V8_THROW_EXCEPTION_WHEN_NOTHING(maybe_res, "Failed to create data property");
+
+    RETURN_BOOL(maybe_res.FromJust());
+}
+
+static PHP_METHOD(V8Object, DefineOwnProperty) {
     zval *php_v8_context_zv;
     zval *php_v8_value_zv;
     zval *php_v8_key_zv;
 
-    zend_long attributes;
+    zend_long attributes = 0;
 
     if (zend_parse_parameters(ZEND_NUM_ARGS(), "ooo|l", &php_v8_context_zv, &php_v8_key_zv, &php_v8_value_zv, &attributes) == FAILURE) {
         return;
@@ -270,20 +341,20 @@ static PHP_METHOD(V8Object, ForceSet) {
     v8::Local<v8::Value> local_value_to_set = php_v8_value_get_value_local(isolate, php_v8_value_value_to_set);
     v8::Local<v8::Object> local_obj = php_v8_value_get_object_local(isolate, php_v8_value);
 
-    v8::Local<v8::String> local_key = php_v8_value_get_string_local(isolate, php_v8_key);
+    v8::Local<v8::Name> local_name = php_v8_value_get_name_local(isolate, php_v8_key);
 
     attributes = attributes ? attributes & PHP_V8_PROPERTY_ATTRIBUTE_FLAGS : attributes;
 
     PHP_V8_TRY_CATCH(isolate);
     PHP_V8_INIT_ISOLATE_LIMITS_ON_OBJECT_VALUE(php_v8_value);
 
-    v8::Maybe<bool> maybe = local_obj->ForceSet(context,
-                                                local_key,
-                                                local_value_to_set,
-                                                static_cast<v8::PropertyAttribute>(attributes));
+    v8::Maybe<bool> maybe = local_obj->DefineOwnProperty(context,
+                                                         local_name,
+                                                         local_value_to_set,
+                                                         static_cast<v8::PropertyAttribute>(attributes));
 
     PHP_V8_MAYBE_CATCH(php_v8_context, try_catch);
-    PHP_V8_THROW_EXCEPTION_WHEN_NOTHING(maybe, "Failed to set persistent");
+    PHP_V8_THROW_EXCEPTION_WHEN_NOTHING(maybe, "Failed to define own property");
 
     RETURN_BOOL(maybe.FromJust())
 }
@@ -1334,10 +1405,21 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_object_SetIndex, ZEND_RETURN_
                 ZEND_ARG_OBJ_INFO(0, value, V8\\Value, 0)
 ZEND_END_ARG_INFO()
 
-// TODO: subject of change due to deprecateion
-ZEND_BEGIN_ARG_INFO_EX(arginfo_v8_object_ForceSet, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 3)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_object_CreateDataProperty, ZEND_RETURN_VALUE, 3, _IS_BOOL, NULL, 0)
+                ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
+                ZEND_ARG_OBJ_INFO(0, key, V8\\NameValue, 0)
+                ZEND_ARG_OBJ_INFO(0, value, V8\\Value, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_object_CreateDataPropertyIndex, ZEND_RETURN_VALUE, 3, _IS_BOOL, NULL, 0)
+                ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
+                ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
+                ZEND_ARG_OBJ_INFO(0, value, V8\\Value, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_object_DefineOwnProperty, ZEND_RETURN_VALUE, 3, _IS_BOOL, NULL, 0)
                 ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
-                ZEND_ARG_INFO(0, key_or_index)
+                ZEND_ARG_OBJ_INFO(0, key, V8\\NameValue, 0)
                 ZEND_ARG_OBJ_INFO(0, value, V8\\Value, 0)
                 ZEND_ARG_INFO(0, attributes)
 ZEND_END_ARG_INFO()
@@ -1510,7 +1592,9 @@ static const zend_function_entry php_v8_object_methods[] = {
         PHP_ME(V8Object, GetContext, arginfo_v8_object_GetContext, ZEND_ACC_PUBLIC)
         PHP_ME(V8Object, Set, arginfo_v8_object_Set, ZEND_ACC_PUBLIC)
         PHP_ME(V8Object, SetIndex, arginfo_v8_object_SetIndex, ZEND_ACC_PUBLIC)
-        PHP_ME(V8Object, ForceSet, arginfo_v8_object_ForceSet, ZEND_ACC_PUBLIC)
+        PHP_ME(V8Object, CreateDataProperty, arginfo_v8_object_CreateDataProperty, ZEND_ACC_PUBLIC)
+        PHP_ME(V8Object, CreateDataPropertyIndex, arginfo_v8_object_CreateDataPropertyIndex, ZEND_ACC_PUBLIC)
+        PHP_ME(V8Object, DefineOwnProperty, arginfo_v8_object_DefineOwnProperty, ZEND_ACC_PUBLIC)
         PHP_ME(V8Object, Get, arginfo_v8_object_Get, ZEND_ACC_PUBLIC)
         PHP_ME(V8Object, GetIndex, arginfo_v8_object_GetIndex, ZEND_ACC_PUBLIC)
         PHP_ME(V8Object, GetPropertyAttributes, arginfo_v8_object_GetPropertyAttributes, ZEND_ACC_PUBLIC)

src/php_v8_script.cc

@@ -103,7 +103,7 @@ static PHP_METHOD(V8Script, __construct)
         origin = new v8::ScriptOrigin(v8::Undefined(isolate));
 
         zval origin_zv;
-        php_v8_create_script_origin(&origin_zv, *origin);
+        php_v8_create_script_origin(&origin_zv, context, *origin);
         zend_update_property(this_ce, getThis(), ZEND_STRL("origin"), &origin_zv);
 
         zval_ptr_dtor(&origin_zv);