Cleanup leftovers of unsupported and no longer supported methods on V8\ObjectTemplate

Author: pinepain

src/php_v8_callbacks.cc

@@ -526,44 +526,3 @@ void php_v8_callback_indexed_property_enumerator(const v8::PropertyCallbackInfo<
 
     zval_ptr_dtor(&args);
 }
-
-bool php_v8_callback_access_check(v8::Local<v8::Context> accessing_context, v8::Local<v8::Object> accessed_object, v8::Local<v8::Value> data) {
-    PHP_V8_THROW_EXCEPTION("Broken due to problem (see https://groups.google.com/forum/?fromgroups#!topic/v8-dev/c7LhW2bNabY)");
-    return false;
-
-    PHP_V8_DECLARE_ISOLATE_LOCAL_ALIAS(v8::Isolate::GetCurrent());
-    php_v8_isolate_t *php_v8_isolate = PHP_V8_ISOLATE_FETCH_REFERENCE(isolate);
-
-
-    zval args;
-    zval accessed_object_zv;
-    zval retval;
-    zval context_zv;
-
-    bool security_retval = false;
-
-    ZVAL_BOOL(&retval, false);
-
-    array_init_size(&args, 2);
-
-    php_v8_context_t *php_v8_context = php_v8_context_get_reference(accessing_context);
-
-    assert(NULL != php_v8_context);
-
-    php_v8_get_or_create_value(&accessed_object_zv, accessed_object, php_v8_isolate);
-
-    ZVAL_OBJ(&context_zv, &php_v8_context->std);
-    add_index_zval(&args, 0, &context_zv);
-    add_index_zval(&args, 1, &accessed_object_zv);
-
-    php_v8_callback_call_from_bucket_with_zargs(phpv8::CallbacksBucket::Index::Callback, data, &args, &retval);
-
-    if (Z_TYPE(retval) == IS_TRUE) {
-        security_retval = true;
-    }
-
-    zval_ptr_dtor(&args);
-    zval_ptr_dtor(&retval);
-
-    return security_retval;
-}

src/php_v8_callbacks.h

@@ -56,8 +56,6 @@ extern void php_v8_callback_indexed_property_query(uint32_t index, const v8::Pro
 extern void php_v8_callback_indexed_property_deleter(uint32_t index, const v8::PropertyCallbackInfo<v8::Boolean>& info);
 extern void php_v8_callback_indexed_property_enumerator(const v8::PropertyCallbackInfo<v8::Array>& info);
 
-extern bool php_v8_callback_access_check(v8::Local<v8::Context> accessing_context, v8::Local<v8::Object> accessed_object, v8::Local<v8::Value> data);
-
 //#define PHP_V8_DEBUG_EXTERNAL_MEM 1
 
 #ifdef PHP_V8_DEBUG_EXTERNAL_MEM

src/php_v8_object_template.cc

@@ -362,41 +362,6 @@ static PHP_METHOD(V8ObjectTemplate, SetCallAsFunctionHandler) {
 
     local_template->SetCallAsFunctionHandler(callback, data);
 }
-// NOTE: Method is not supported anymore due to a limited use and a way it implemented (causes segfault under certain conditions)
-/*
-static PHP_METHOD(V8ObjectTemplate, MarkAsUndetectable) {
-    if (zend_parse_parameters_none() == FAILURE) {
-        return;
-    }
-
-    PHP_V8_FETCH_OBJECT_TEMPLATE_WITH_CHECK(getThis(), php_v8_object_template);
-    PHP_V8_ENTER_STORED_ISOLATE(php_v8_object_template);
-
-    v8::Local<v8::ObjectTemplate> local_template = php_v8_object_template_get_local(isolate, php_v8_object_template);
-
-    local_template->MarkAsUndetectable();
-}
-*/
-
-// not used currently
-static PHP_METHOD(V8ObjectTemplate, SetAccessCheckCallback) {
-    zend_fcall_info fci_callback = empty_fcall_info;
-    zend_fcall_info_cache fci_cache_callback = empty_fcall_info_cache;
-
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "f", &fci_callback, &fci_cache_callback) == FAILURE) {
-        return;
-    }
-
-    PHP_V8_FETCH_OBJECT_TEMPLATE_WITH_CHECK(getThis(), php_v8_object_template);
-    PHP_V8_ENTER_STORED_ISOLATE(php_v8_object_template);
-
-    phpv8::CallbacksBucket *bucket = php_v8_object_template->persistent_data->bucket("access_check");
-    bucket->add(phpv8::CallbacksBucket::Index::Callback, fci_callback, fci_cache_callback);
-
-    v8::Local<v8::ObjectTemplate> local_template = php_v8_object_template_get_local(php_v8_object_template);
-
-    local_template->SetAccessCheckCallback(php_v8_callback_access_check, v8::External::New(isolate, bucket));
-}
 
 /* Non-standard, implementations of AdjustableExternalMemoryInterface::AdjustExternalAllocatedMemory */
 static PHP_METHOD(V8ObjectTemplate, AdjustExternalAllocatedMemory) {
@@ -472,21 +437,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_php_v8_object_template_SetCallAsFunctionHandler,
                 ZEND_ARG_INFO(0, callback)
 ZEND_END_ARG_INFO()
 
-// not used
-// void method
-/*
-ZEND_BEGIN_ARG_INFO_EX(arginfo_php_v8_object_template_MarkAsUndetectable, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
-ZEND_END_ARG_INFO()
-*/
-
-// not used
-// void method
-/*
-ZEND_BEGIN_ARG_INFO_EX(arginfo_php_v8_object_template_SetAccessCheckCallback, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
-                ZEND_ARG_CALLABLE_INFO(0, callback, 1)
-ZEND_END_ARG_INFO()
-*/
-
 PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_object_template_AdjustExternalAllocatedMemory, ZEND_RETURN_VALUE, 1, IS_LONG, 0)
                 ZEND_ARG_TYPE_INFO(0, change_in_bytes, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -511,8 +461,6 @@ static const zend_function_entry php_v8_object_template_methods[] = {
         PHP_ME(V8ObjectTemplate, SetHandlerForNamedProperty, arginfo_php_v8_object_template_SetHandlerForNamedProperty, ZEND_ACC_PUBLIC)
         PHP_ME(V8ObjectTemplate, SetHandlerForIndexedProperty, arginfo_php_v8_object_template_SetHandlerForIndexedProperty, ZEND_ACC_PUBLIC)
         PHP_ME(V8ObjectTemplate, SetCallAsFunctionHandler, arginfo_php_v8_object_template_SetCallAsFunctionHandler, ZEND_ACC_PUBLIC)
-//        PHP_ME(V8ObjectTemplate, MarkAsUndetectable, arginfo_php_v8_object_template_MarkAsUndetectable, ZEND_ACC_PUBLIC)
-//        PHP_ME(V8ObjectTemplate, SetAccessCheckCallback, arginfo_php_v8_object_template_SetAccessCheckCallback, ZEND_ACC_PUBLIC)
 
         PHP_ME(V8ObjectTemplate, AdjustExternalAllocatedMemory, arginfo_v8_object_template_AdjustExternalAllocatedMemory, ZEND_ACC_PUBLIC)
         PHP_ME(V8ObjectTemplate, GetExternalAllocatedMemory,    arginfo_v8_object_template_GetExternalAllocatedMemory, ZEND_ACC_PUBLIC)

stubs/src/ObjectTemplate.php

@@ -85,18 +85,6 @@ public function SetAccessor(
     ) {
     }
 
-    ///**
-    // * Sets a named or indexed property handler on the object template.
-    // *
-    // * See \v8\NamedPropertyHandlerConfiguration and \v8\IndexedPropertyHandlerConfiguration constructor argument
-    // * description for details
-    // *
-    // * @param \v8\NamedPropertyHandlerConfiguration | \v8\IndexedPropertyHandlerConfiguration $configuration
-    // */
-    //public function SetHandler(NamedPropertyHandlerConfiguration $configuration)
-    //{
-    //}
-
     /**
      * Sets a named property handler on the object template.
      *
@@ -140,46 +128,6 @@ public function SetCallAsFunctionHandler(callable $callback)
     {
     }
 
-    // Method is not supported anymore due to a limited use and a way it implemented (causes segfault under certain conditions)
-    // see v8/src/api-natives.cc:677
-    //  // Mark as undetectable if needed.
-    //  if (obj->undetectable()) {
-    //    // We only allow callable undetectable receivers here, since this whole
-    //    // undetectable business is only to support document.all, which is both
-    //    // undetectable and callable. If we ever see the need to have an object
-    //    // that is undetectable but not callable, we need to update the types.h
-    //    // to allow encoding this.
-    //    CHECK(!obj->instance_call_handler()->IsUndefined(isolate));
-    //    map->set_is_undetectable();
-    //  }
-
-
-    ///**
-    // * Mark object instances of the template as undetectable.
-    // *
-    // * In many ways, undetectable objects behave as though they are not
-    // * there.  They behave like 'undefined' in conditionals and when
-    // * printed.  However, properties can be accessed and called as on
-    // * normal objects.
-    // */
-    //public function MarkAsUndetectable()
-    //{
-    //}
-
-    // Disabled due to https://groups.google.com/forum/#!topic/v8-dev/c7LhW2bNabY and it should be not necessary to use
-    // it in other then browser setup in most cases, though It would be nice to have it for API consistency reason.
-    ///**
-    // * Sets access check callback on the object template and enables access
-    // * checks.
-    // *
-    // * When accessing properties on instances of this object template,
-    // * the access check callback will be called to determine whether or
-    // * not to allow cross-context access to the properties.
-    // */
-    //public function SetAccessCheckCallback(callable $callback)
-    //{
-    //}
-
     /**
      * {@inheritdoc}
      */