From 9299d64d26672890845bdfda3cdc8b2fe1b1c827 Mon Sep 17 00:00:00 2001 From: Bogdan Padalko Date: Fri, 8 Sep 2017 01:06:51 +0300 Subject: [PATCH 1/7] Add missed method to Value stub [skip ci] --- stubs/src/Value.php | 225 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 225 insertions(+) diff --git a/stubs/src/Value.php b/stubs/src/Value.php index 88ea909..383c6c8 100644 --- a/stubs/src/Value.php +++ b/stubs/src/Value.php @@ -225,6 +225,231 @@ public function isRegExp(): bool { } + /** + * Returns true if this value is an async function. + * + * @return bool + */ + public function isAsyncFunction(): bool + { + } + + /** + * Returns true if this value is a Generator function. + * + * @return bool + */ + public function isGeneratorFunction(): bool + { + } + + /** + * Returns true if this value is a Generator object (iterator). + * + * @return bool + */ + public function isGeneratorObject(): bool + { + } + + /** + * Returns true if this value is a Promise. + * + * @return bool + */ + public function isPromise(): bool + { + } + + /** + * Returns true if this value is a Map. + * + * @return bool + */ + public function isMap(): bool + { + } + + /** + * Returns true if this value is a Set. + * + * @return bool + */ + public function isSet(): bool + { + } + + /** + * Returns true if this value is a Map Iterator. + * + * @return bool + */ + public function isMapIterator(): bool + { + } + + /** + * Returns true if this value is a Set Iterator. + * + * @return bool + */ + public function isSetIterator(): bool + { + } + + /** + * Returns true if this value is a WeakMap. + * + * @return bool + */ + public function isWeakMap(): bool + { + } + + /** + * Returns true if this value is a WeakSet. + * + * @return bool + */ + public function isWeakSet(): bool + { + } + + /** + * Returns true if this value is an ArrayBuffer. + * + * @return bool + */ + public function isArrayBuffer(): bool + { + } + + /** + * Returns true if this value is an ArrayBufferView. + * + * @return bool + */ + public function isArrayBufferView(): bool + { + } + + /** + * Returns true if this value is one of TypedArrays. + * + * @return bool + */ + public function isTypedArray(): bool + { + } + + /** + * Returns true if this value is an Uint8Array. + * + * @return bool + */ + public function isUint8Array(): bool + { + } + + /** + * Returns true if this value is an Uint8ClampedArray. + * + * @return bool + */ + public function isUint8ClampedArray(): bool + { + } + + /** + * Returns true if this value is an Int8Array. + * + * @return bool + */ + public function isInt8Array(): bool + { + } + + /** + * Returns true if this value is an Uint16Array. + * + * @return bool + */ + public function isUint16Array(): bool + { + } + + /** + * Returns true if this value is an Int16Array. + * + * @return bool + */ + public function isInt16Array(): bool + { + } + + /** + * Returns true if this value is an Uint32Array. + * + * @return bool + */ + public function isUint32Array(): bool + { + } + + /** + * Returns true if this value is an Int32Array. + * + * @return bool + */ + public function isInt32Array(): bool + { + } + + /** + * Returns true if this value is a Float32Array. + * + * @return bool + */ + public function isFloat32Array(): bool + { + } + + /** + * Returns true if this value is a Float64Array. + * + * @return bool + */ + public function isFloat64Array(): bool + { + } + + /** + * Returns true if this value is a DataView. + * + * @return bool + */ + public function isDataView(): bool + { + } + + /** + * Returns true if this value is a SharedArrayBuffer. + * This is an experimental feature. + * + * @return bool + */ + public function isSharedArrayBuffer(): bool + { + } + + /** + * Returns true if this value is a JavaScript Proxy. + * + * @return bool + */ + public function isProxy(): bool + { + } /** * @param Context $context From 305ecb2e60caa5f0080f814f4a7b1e4884925c74 Mon Sep 17 00:00:00 2001 From: Bogdan Padalko Date: Sat, 16 Sep 2017 01:13:54 +0300 Subject: [PATCH 2/7] Fix improperly adjusted external allocated memory on weak callback call --- src/php_v8_value.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/php_v8_value.cc b/src/php_v8_value.cc index 752a85e..ee9dfb3 100644 --- a/src/php_v8_value.cc +++ b/src/php_v8_value.cc @@ -67,9 +67,6 @@ static void php_v8_value_weak_callback(const v8::WeakCallbackInfoReset(); delete data.GetParameter(); - - // Tell v8 that we release external allocated memory - isolate->AdjustAmountOfExternalAllocatedMemory(-1024 * 1024 * 1024); } static void php_v8_value_make_weak(php_v8_value_t *php_v8_value) { From efffa835048146c6b4186b18159c46d537db4097 Mon Sep 17 00:00:00 2001 From: Bogdan Padalko Date: Fri, 15 Sep 2017 23:40:16 +0300 Subject: [PATCH 3/7] Add Proxy and Promise builtin support, closes #55 --- config.m4 | 2 + src/php_v8_promise.cc | 266 +++++++++++++++++++++++ src/php_v8_promise.h | 33 +++ src/php_v8_proxy.cc | 154 +++++++++++++ src/php_v8_proxy.h | 31 +++ src/php_v8_value.cc | 10 + stubs/src/PromiseObject.php | 111 ++++++++++ stubs/src/ProxyObject.php | 57 +++++ tests/001-verify-methods-signature.phpt | 2 +- tests/001-verify_extension_entities.phpt | 24 ++ tests/PromiseObject.phpt | 217 ++++++++++++++++++ tests/PromiseObject_methods.phpt | 212 ++++++++++++++++++ tests/ProxyObject.phpt | 220 +++++++++++++++++++ tests/ProxyObject_methods.phpt | 39 ++++ v8.cc | 4 + 15 files changed, 1381 insertions(+), 1 deletion(-) create mode 100644 src/php_v8_promise.cc create mode 100644 src/php_v8_promise.h create mode 100644 src/php_v8_proxy.cc create mode 100644 src/php_v8_proxy.h create mode 100644 stubs/src/PromiseObject.php create mode 100644 stubs/src/ProxyObject.php create mode 100644 tests/PromiseObject.phpt create mode 100644 tests/PromiseObject_methods.phpt create mode 100644 tests/ProxyObject.phpt create mode 100644 tests/ProxyObject_methods.phpt diff --git a/config.m4 b/config.m4 index d68be07..255c3c0 100644 --- a/config.m4 +++ b/config.m4 @@ -203,6 +203,8 @@ if test "$PHP_V8" != "no"; then src/php_v8_set.cc \ src/php_v8_date.cc \ src/php_v8_regexp.cc \ + src/php_v8_promise.cc \ + src/php_v8_proxy.cc \ src/php_v8_number_object.cc \ src/php_v8_boolean_object.cc \ src/php_v8_string_object.cc \ diff --git a/src/php_v8_promise.cc b/src/php_v8_promise.cc new file mode 100644 index 0000000..800308a --- /dev/null +++ b/src/php_v8_promise.cc @@ -0,0 +1,266 @@ +/* + * This file is part of the pinepain/php-v8 PHP extension. + * + * Copyright (c) 2015-2017 Bogdan Padalko + * + * Licensed under the MIT license: http://opensource.org/licenses/MIT + * + * For the full copyright and license information, please view the + * LICENSE file that was distributed with this source or visit + * http://opensource.org/licenses/MIT + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "php_v8_promise.h" +#include "php_v8_object.h" +#include "php_v8_string.h" +#include "php_v8_value.h" +#include "php_v8_context.h" +#include "php_v8.h" + +zend_class_entry *php_v8_promise_class_entry; + +#define this_ce php_v8_promise_class_entry + + +static PHP_METHOD(Promise, __construct) { + zval rv; + zval *php_v8_context_zv; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &php_v8_context_zv) == FAILURE) { + return; + } + + PHP_V8_OBJECT_CONSTRUCT(getThis(), php_v8_context_zv, php_v8_context, php_v8_value); + + v8::MaybeLocal maybe_local_resolver = v8::Promise::Resolver::New(context); + + PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(maybe_local_resolver, "Failed to create Promise object"); + + // under the v8 hood v8::Promise::Resolver and v8::Promise are interchangable (with cast) + v8::Local local_resolver = maybe_local_resolver.ToLocalChecked(); + php_v8_object_store_self_ptr(php_v8_value, local_resolver); + + php_v8_value->persistent->Reset(isolate, local_resolver); +} + +static PHP_METHOD(Promise, resolve) { + zval *php_v8_context_zv; + zval *php_v8_rvalue_zv; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "oo", &php_v8_context_zv, &php_v8_rvalue_zv) == FAILURE) { + return; + } + + PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value); + PHP_V8_CONTEXT_FETCH_WITH_CHECK(php_v8_context_zv, php_v8_context); + PHP_V8_VALUE_FETCH_WITH_CHECK(php_v8_rvalue_zv, php_v8_rvalue); + + PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_context); + PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_rvalue); + + PHP_V8_ENTER_STORED_ISOLATE(php_v8_value); + PHP_V8_ENTER_CONTEXT(php_v8_context); + + v8::Local local_resolver = php_v8_value_get_local_as(php_v8_value); + v8::Local local_rvalue = php_v8_value_get_local_as(php_v8_rvalue); + + v8::Maybe maybe_resolved = local_resolver->Resolve(context, local_rvalue); + + PHP_V8_THROW_VALUE_EXCEPTION_WHEN_NOTHING(maybe_resolved, "Failed to resolve a promise"); +} + +static PHP_METHOD(Promise, reject) { + zval *php_v8_context_zv; + zval *php_v8_rvalue_zv; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "oo", &php_v8_context_zv, &php_v8_rvalue_zv) == FAILURE) { + return; + } + + PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value); + PHP_V8_CONTEXT_FETCH_WITH_CHECK(php_v8_context_zv, php_v8_context); + PHP_V8_VALUE_FETCH_WITH_CHECK(php_v8_rvalue_zv, php_v8_rvalue); + + PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_context); + PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_rvalue); + + PHP_V8_ENTER_STORED_ISOLATE(php_v8_value); + PHP_V8_ENTER_CONTEXT(php_v8_context); + + v8::Local local_resolver = php_v8_value_get_local_as(php_v8_value); + v8::Local local_rvalue = php_v8_value_get_local_as(php_v8_rvalue); + + v8::Maybe maybe_rejected = local_resolver->Reject(context, local_rvalue); + + PHP_V8_THROW_VALUE_EXCEPTION_WHEN_NOTHING(maybe_rejected, "Failed to reject a promise"); +} + +static PHP_METHOD(Promise, catch) { + zval *php_v8_context_zv; + zval *php_v8_function_zv; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "oo", &php_v8_context_zv, &php_v8_function_zv) == FAILURE) { + return; + } + + PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value); + PHP_V8_CONTEXT_FETCH_WITH_CHECK(php_v8_context_zv, php_v8_context); + PHP_V8_VALUE_FETCH_WITH_CHECK(php_v8_function_zv, php_v8_function); + + PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_context); + PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_function); + + PHP_V8_ENTER_STORED_ISOLATE(php_v8_value); + PHP_V8_ENTER_CONTEXT(php_v8_context); + + v8::Local local_promise = php_v8_value_get_local_as(php_v8_value); + v8::Local local_function = php_v8_value_get_local_as(php_v8_function); + + v8::MaybeLocal maybe_local_promise = local_promise->Catch(context, local_function); + + PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(maybe_local_promise, "Failed to register rejection handler with a promise"); + + php_v8_get_or_create_value(return_value, maybe_local_promise.ToLocalChecked(), php_v8_context->php_v8_isolate); +} + +static PHP_METHOD(Promise, then) { + zval *php_v8_context_zv; + zval *php_v8_function_zv; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "oo", &php_v8_context_zv, &php_v8_function_zv) == FAILURE) { + return; + } + + PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value); + PHP_V8_CONTEXT_FETCH_WITH_CHECK(php_v8_context_zv, php_v8_context); + PHP_V8_VALUE_FETCH_WITH_CHECK(php_v8_function_zv, php_v8_function); + + PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_context); + PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_function); + + PHP_V8_ENTER_STORED_ISOLATE(php_v8_value); + PHP_V8_ENTER_CONTEXT(php_v8_context); + + v8::Local local_promise = php_v8_value_get_local_as(php_v8_value); + v8::Local local_function = php_v8_value_get_local_as(php_v8_function); + + v8::MaybeLocal maybe_local_promise = local_promise->Then(context, local_function); + + PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(maybe_local_promise, "Failed to register resolution handler with a promise"); + + php_v8_get_or_create_value(return_value, maybe_local_promise.ToLocalChecked(), php_v8_context->php_v8_isolate); +} + +static PHP_METHOD(Promise, hasHandler) { + if (zend_parse_parameters_none() == FAILURE) { + return; + } + + PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value); + PHP_V8_ENTER_STORED_ISOLATE(php_v8_value); + PHP_V8_ENTER_STORED_CONTEXT(php_v8_value); + + v8::Local local_promise = php_v8_value_get_local_as(php_v8_value); + + RETURN_BOOL(static_cast(local_promise->HasHandler())); +} + +static PHP_METHOD(Promise, result) { + if (zend_parse_parameters_none() == FAILURE) { + return; + } + + PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value); + PHP_V8_ENTER_STORED_ISOLATE(php_v8_value); + PHP_V8_ENTER_STORED_CONTEXT(php_v8_value); + + v8::Local local_promise = php_v8_value_get_local_as(php_v8_value); + + if (v8::Promise::PromiseState::kPending == local_promise->State()) { + PHP_V8_THROW_VALUE_EXCEPTION("Promise is in pending state"); + return; + } + + v8::Local local_value = local_promise->Result(); + + php_v8_get_or_create_value(return_value, local_value, php_v8_value->php_v8_isolate); +} + +static PHP_METHOD(Promise, state) { + if (zend_parse_parameters_none() == FAILURE) { + return; + } + + PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value); + PHP_V8_ENTER_STORED_ISOLATE(php_v8_value); + PHP_V8_ENTER_STORED_CONTEXT(php_v8_value); + + v8::Local local_promise = php_v8_value_get_local_as(php_v8_value); + + RETURN_LONG(static_cast(local_promise->State())); +} + + +PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 1) + ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0) +ZEND_END_ARG_INFO() + +PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_resolve, 2) + ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0) + ZEND_ARG_OBJ_INFO(0, value, V8\\Value, 0) +ZEND_END_ARG_INFO() + +PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_reject, 2) + ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0) + ZEND_ARG_OBJ_INFO(0, value, V8\\Value, 0) +ZEND_END_ARG_INFO() + +PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_catch, ZEND_RETURN_VALUE, 2, V8\\PromiseObject, 0) + ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0) + ZEND_ARG_OBJ_INFO(0, handler, V8\\FunctionObject, 0) +ZEND_END_ARG_INFO() + +PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_then, ZEND_RETURN_VALUE, 2, V8\\PromiseObject, 0) + ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0) + ZEND_ARG_OBJ_INFO(0, handler, V8\\FunctionObject, 0) +ZEND_END_ARG_INFO() + +PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_hasHandler, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0) +ZEND_END_ARG_INFO() + +PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_result, ZEND_RETURN_VALUE, 0, V8\\Value, 0) +ZEND_END_ARG_INFO() + +PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_state, ZEND_RETURN_VALUE, 0, IS_LONG, 0) +ZEND_END_ARG_INFO() + + +static const zend_function_entry php_v8_promise_methods[] = { + PHP_V8_ME(Promise, __construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR) + PHP_V8_ME(Promise, resolve, ZEND_ACC_PUBLIC) + PHP_V8_ME(Promise, reject, ZEND_ACC_PUBLIC) + PHP_V8_ME(Promise, catch, ZEND_ACC_PUBLIC) + PHP_V8_ME(Promise, then, ZEND_ACC_PUBLIC) + PHP_V8_ME(Promise, hasHandler, ZEND_ACC_PUBLIC) + PHP_V8_ME(Promise, result, ZEND_ACC_PUBLIC) + PHP_V8_ME(Promise, state, ZEND_ACC_PUBLIC) + + PHP_FE_END +}; + + +PHP_MINIT_FUNCTION(php_v8_promise) { + zend_class_entry ce; + INIT_NS_CLASS_ENTRY(ce, PHP_V8_NS, "PromiseObject", php_v8_promise_methods); + this_ce = zend_register_internal_class_ex(&ce, php_v8_object_class_entry); + + zend_declare_class_constant_long(this_ce, ZEND_STRL("STATE_PENDING"), static_cast(v8::Promise::PromiseState::kPending)); + zend_declare_class_constant_long(this_ce, ZEND_STRL("STATE_FULFILLED"), static_cast(v8::Promise::PromiseState::kFulfilled)); + zend_declare_class_constant_long(this_ce, ZEND_STRL("STATE_REJECTED"), static_cast(v8::Promise::PromiseState::kRejected)); + + return SUCCESS; +} diff --git a/src/php_v8_promise.h b/src/php_v8_promise.h new file mode 100644 index 0000000..87831e9 --- /dev/null +++ b/src/php_v8_promise.h @@ -0,0 +1,33 @@ +/* + * This file is part of the pinepain/php-v8 PHP extension. + * + * Copyright (c) 2015-2017 Bogdan Padalko + * + * Licensed under the MIT license: http://opensource.org/licenses/MIT + * + * For the full copyright and license information, please view the + * LICENSE file that was distributed with this source or visit + * http://opensource.org/licenses/MIT + */ + +#ifndef PHP_V8_PROMISE_H +#define PHP_V8_PROMISE_H + +#include "php_v8_value.h" +#include + +extern "C" { +#include "php.h" + +#ifdef ZTS +#include "TSRM.h" +#endif +} + +extern zend_class_entry* php_v8_promise_class_entry; +extern zend_class_entry* php_v8_promise_flags_class_entry; + + +PHP_MINIT_FUNCTION(php_v8_promise); + +#endif //PHP_V8_PROMISE_H diff --git a/src/php_v8_proxy.cc b/src/php_v8_proxy.cc new file mode 100644 index 0000000..357d307 --- /dev/null +++ b/src/php_v8_proxy.cc @@ -0,0 +1,154 @@ +/* + * This file is part of the pinepain/php-v8 PHP extension. + * + * Copyright (c) 2015-2017 Bogdan Padalko + * + * Licensed under the MIT license: http://opensource.org/licenses/MIT + * + * For the full copyright and license information, please view the + * LICENSE file that was distributed with this source or visit + * http://opensource.org/licenses/MIT + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "php_v8_proxy.h" +#include "php_v8_object.h" +#include "php_v8_value.h" +#include "php_v8_context.h" +#include "php_v8.h" + +zend_class_entry *php_v8_proxy_class_entry; + +#define this_ce php_v8_proxy_class_entry + + +static PHP_METHOD(Proxy, __construct) { + zval rv; + zval *php_v8_context_zv; + zval *php_v8_target_zv; + zval *php_v8_handler_zv; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ooo", &php_v8_context_zv, &php_v8_target_zv, &php_v8_handler_zv) == + FAILURE) { + return; + } + + PHP_V8_OBJECT_CONSTRUCT(getThis(), php_v8_context_zv, php_v8_context, php_v8_value); + PHP_V8_VALUE_FETCH_WITH_CHECK(php_v8_target_zv, php_v8_target); + PHP_V8_VALUE_FETCH_WITH_CHECK(php_v8_handler_zv, php_v8_handler); + + PHP_V8_DATA_ISOLATES_CHECK(php_v8_target, php_v8_context); + PHP_V8_DATA_ISOLATES_CHECK(php_v8_handler, php_v8_context); + + v8::Local local_target = php_v8_value_get_local_as(php_v8_target); + v8::Local local_handler = php_v8_value_get_local_as(php_v8_handler); + + v8::MaybeLocal maybe_local_proxy = v8::Proxy::New(context, local_target, local_handler); + + PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(maybe_local_proxy, "Failed to create Proxy object"); + + v8::Local local_Proxy = maybe_local_proxy.ToLocalChecked(); + + php_v8_object_store_self_ptr(php_v8_value, local_Proxy); + + php_v8_value->persistent->Reset(isolate, local_Proxy); +} + + +static PHP_METHOD(Proxy, getTarget) { + if (zend_parse_parameters_none() == FAILURE) { + return; + } + + PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value); + PHP_V8_ENTER_STORED_ISOLATE(php_v8_value); + PHP_V8_ENTER_STORED_CONTEXT(php_v8_value); + + v8::Local local_target = php_v8_value_get_local_as(php_v8_value)->GetTarget(); + + php_v8_get_or_create_value(return_value, local_target, php_v8_value->php_v8_isolate); +} + +static PHP_METHOD(Proxy, getHandler) { + if (zend_parse_parameters_none() == FAILURE) { + return; + } + + PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value); + PHP_V8_ENTER_STORED_ISOLATE(php_v8_value); + PHP_V8_ENTER_STORED_CONTEXT(php_v8_value); + + v8::Local local_handler = php_v8_value_get_local_as(php_v8_value)->GetHandler(); + + if (local_handler->IsUndefined()) { + RETURN_NULL(); + } + + php_v8_get_or_create_value(return_value, local_handler, php_v8_value->php_v8_isolate); +} + +static PHP_METHOD(Proxy, isRevoked) { + if (zend_parse_parameters_none() == FAILURE) { + return; + } + + PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value); + PHP_V8_ENTER_STORED_ISOLATE(php_v8_value); + PHP_V8_ENTER_STORED_CONTEXT(php_v8_value); + + RETURN_BOOL(static_cast(php_v8_value_get_local_as(php_v8_value)->IsRevoked())); +} + +static PHP_METHOD(Proxy, revoke) { + if (zend_parse_parameters_none() == FAILURE) { + return; + } + + PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value); + PHP_V8_ENTER_STORED_ISOLATE(php_v8_value); + PHP_V8_ENTER_STORED_CONTEXT(php_v8_value); + + php_v8_value_get_local_as(php_v8_value)->Revoke(); +} + + +PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 2) + ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0) + ZEND_ARG_OBJ_INFO(0, target, V8\\ObjectValue, 0) + ZEND_ARG_OBJ_INFO(0, handler, V8\\ObjectValue, 0) +ZEND_END_ARG_INFO() + +PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getTarget, ZEND_RETURN_VALUE, 0, V8\\ObjectValue, 0) +ZEND_END_ARG_INFO() + +PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getHandler, ZEND_RETURN_VALUE, 0, V8\\Value, 0) +ZEND_END_ARG_INFO() + +PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_isRevoked, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0) +ZEND_END_ARG_INFO() + +PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_revoke, 0) +ZEND_END_ARG_INFO() + + +static const zend_function_entry php_v8_proxy_methods[] = { + PHP_V8_ME(Proxy, __construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR) + PHP_V8_ME(Proxy, getTarget, ZEND_ACC_PUBLIC) + PHP_V8_ME(Proxy, getHandler, ZEND_ACC_PUBLIC) + PHP_V8_ME(Proxy, isRevoked, ZEND_ACC_PUBLIC) + PHP_V8_ME(Proxy, revoke, ZEND_ACC_PUBLIC) + + PHP_FE_END +}; + + +PHP_MINIT_FUNCTION (php_v8_proxy) { + zend_class_entry ce; + INIT_NS_CLASS_ENTRY(ce, PHP_V8_NS, "ProxyObject", php_v8_proxy_methods); + this_ce = zend_register_internal_class_ex(&ce, php_v8_object_class_entry); + + return SUCCESS; +} diff --git a/src/php_v8_proxy.h b/src/php_v8_proxy.h new file mode 100644 index 0000000..daa5f87 --- /dev/null +++ b/src/php_v8_proxy.h @@ -0,0 +1,31 @@ +/* + * This file is part of the pinepain/php-v8 PHP extension. + * + * Copyright (c) 2015-2017 Bogdan Padalko + * + * Licensed under the MIT license: http://opensource.org/licenses/MIT + * + * For the full copyright and license information, please view the + * LICENSE file that was distributed with this source or visit + * http://opensource.org/licenses/MIT + */ + +#ifndef PHP_V8_PROXY_H +#define PHP_V8_PROXY_H + +#include "php_v8_value.h" +#include + +extern "C" { +#include "php.h" + +#ifdef ZTS +#include "TSRM.h" +#endif +} + +extern zend_class_entry* php_v8_proxy_class_entry; + +PHP_MINIT_FUNCTION(php_v8_proxy); + +#endif //PHP_V8_PROXY_H diff --git a/src/php_v8_value.cc b/src/php_v8_value.cc index ee9dfb3..feefcc5 100644 --- a/src/php_v8_value.cc +++ b/src/php_v8_value.cc @@ -28,6 +28,8 @@ #include "php_v8_array.h" #include "php_v8_map.h" #include "php_v8_set.h" +#include "php_v8_promise.h" +#include "php_v8_proxy.h" #include "php_v8_object.h" #include "php_v8_null.h" @@ -229,6 +231,10 @@ zend_class_entry *php_v8_get_class_entry_from_value(v8::Local value) } */ + if (value->IsPromise()) { + return php_v8_promise_class_entry; + } + if (value->IsMap()) { return php_v8_map_class_entry; } @@ -237,6 +243,10 @@ zend_class_entry *php_v8_get_class_entry_from_value(v8::Local value) return php_v8_set_class_entry; } + if(value->IsProxy()) { + return php_v8_proxy_class_entry; + } + // anything else will be just an object return php_v8_object_class_entry; } diff --git a/stubs/src/PromiseObject.php b/stubs/src/PromiseObject.php new file mode 100644 index 0000000..8b126c5 --- /dev/null +++ b/stubs/src/PromiseObject.php @@ -0,0 +1,111 @@ + + * + * Licensed under the MIT license: http://opensource.org/licenses/MIT + * + * For the full copyright and license information, please view the + * LICENSE file that was distributed with this source or visit + * http://opensource.org/licenses/MIT + */ + + +namespace V8; + + +class PromiseObject extends ObjectValue +{ + const STATE_PENDING = 0; + const STATE_FULFILLED = 1; + const STATE_REJECTED = 2; + + /** + * @param Context $context + */ + public function __construct(Context $context) + { + } + + /** + * Resolve the promise with a given value. Ignored if the promise is no longer pending. + * + * @param Context $context + * @param Value $value + */ + public function resolve(Context $context, Value $value) + { + } + + /** + * Reject the promise with a given value. Ignored if the promise is no longer pending. + * + * @param Context $context + * @param Value $value + */ + public function reject(Context $context, Value $value) + { + } + + /** + * Register a resolution/rejection handler with the promise. + * + * The handler is given the respective rejection value as + * an argument. If the promise is already rejected, the handler is + * invoked at the end of turn. + * + * @param Context $context + * @param FunctionObject $handler + * + * @return PromiseObject + */ + public function catch(Context $context, FunctionObject $handler): PromiseObject + { + } + + /** + * Register a resolution/rejection handler with the promise. + * + * The handler is given the respective resolution value as + * an argument. If the promise is already resolved, the handler is + * invoked at the end of turn. + * + * @param Context $context + * @param FunctionObject $handler + * + * @return PromiseObject + */ + public function then(Context $context, FunctionObject $handler): PromiseObject + { + } + + /** + * Returns true if the promise has at least one derived promise, and + * therefore resolve/reject handlers (including default handler). + * + * @return bool + */ + public function hasHandler(): bool + { + } + + /** + * Returns the content of the promise result (resolve or reject value). The Promise must not be pending. + * + * @return Value + */ + public function result(): Value + { + } + + /** + * Returns the promise state value. + * + * @return int + */ + public function state(): int + { + } +} diff --git a/stubs/src/ProxyObject.php b/stubs/src/ProxyObject.php new file mode 100644 index 0000000..533f4cc --- /dev/null +++ b/stubs/src/ProxyObject.php @@ -0,0 +1,57 @@ + + * + * Licensed under the MIT license: http://opensource.org/licenses/MIT + * + * For the full copyright and license information, please view the + * LICENSE file that was distributed with this source or visit + * http://opensource.org/licenses/MIT + */ + + +namespace V8; + + +class ProxyObject extends ObjectValue +{ + /** + * @param Context $context + * @param ObjectValue $target + * @param ObjectValue $handler + */ + public function __construct(Context $context, ObjectValue $target, ObjectValue $handler) + { + } + + /*** + * @return ObjectValue + */ + public function getTarget(): ObjectValue + { + } + + /** + * @return Value + */ + public function getHandler(): Value + { + } + + /** + * @return bool + */ + public function isRevoked(): bool + { + } + + /** + * @return void + */ + public function revoke() + { + } +} diff --git a/tests/001-verify-methods-signature.phpt b/tests/001-verify-methods-signature.phpt index fbe67b3..1aece3e 100644 --- a/tests/001-verify-methods-signature.phpt +++ b/tests/001-verify-methods-signature.phpt @@ -36,7 +36,7 @@ class Verifier } if(!class_exists($type) && !interface_exists($type)) { - $method_name = $method->getDeclaringClass()->getName() . '::' . $method->getDeclaringFunction()->getName(); + $method_name = $method->getDeclaringClass()->getName() . '::' . $method->getName(); $shortcut = $method_name . '/return type'; if (isset($this->invalid[$shortcut])) { return; diff --git a/tests/001-verify_extension_entities.phpt b/tests/001-verify_extension_entities.phpt index afdf971..eac4ee5 100644 --- a/tests/001-verify_extension_entities.phpt +++ b/tests/001-verify_extension_entities.phpt @@ -771,6 +771,30 @@ final class V8\RegExpObject\Flags const STICKY = 8 const UNICODE = 16 +class V8\PromiseObject + extends V8\ObjectValue + implements V8\AdjustableExternalMemoryInterface + const STATE_PENDING = 0 + const STATE_FULFILLED = 1 + const STATE_REJECTED = 2 + public function __construct(V8\Context $context) + public function resolve(V8\Context $context, V8\Value $value) + public function reject(V8\Context $context, V8\Value $value) + public function catch(V8\Context $context, V8\FunctionObject $handler): V8\PromiseObject + public function then(V8\Context $context, V8\FunctionObject $handler): V8\PromiseObject + public function hasHandler(): bool + public function result(): V8\Value + public function state(): int + +class V8\ProxyObject + extends V8\ObjectValue + implements V8\AdjustableExternalMemoryInterface + public function __construct(V8\Context $context, V8\ObjectValue $target, V8\ObjectValue $handler) + public function getTarget(): V8\ObjectValue + public function getHandler(): V8\Value + public function isRevoked(): bool + public function revoke() + class V8\NumberObject extends V8\ObjectValue implements V8\AdjustableExternalMemoryInterface diff --git a/tests/PromiseObject.phpt b/tests/PromiseObject.phpt new file mode 100644 index 0000000..d19d259 --- /dev/null +++ b/tests/PromiseObject.phpt @@ -0,0 +1,217 @@ +--TEST-- +V8\PromiseObject +--SKIPIF-- + +--ENV-- +HOME=/tmp/we-need-home-env-var-set-to-load-valgrindrc +--FILE-- +header('Object representation'); +$helper->dump($value); +$helper->space(); + +$helper->assert('PromiseObject extends Value', $value instanceof \V8\Value); +$helper->assert('PromiseObject does not extend PrimitiveValue', !($value instanceof \V8\PrimitiveValue)); +$helper->assert('PromiseObject implements AdjustableExternalMemoryInterface', $value instanceof \V8\AdjustableExternalMemoryInterface); +$helper->assert('PromiseObject is instanceof Promise', $value->instanceOf($context, $context->globalObject()->get($context, new \V8\StringValue($isolate, 'Promise')))); +$helper->line(); + +$helper->header('Accessors'); +$helper->method_matches($value, 'getIsolate', $isolate); +$helper->method_matches($value, 'getContext', $context); +$helper->space(); + +$helper->header('Getters'); +$helper->assert('GetIdentityHash is integer', gettype($value->getIdentityHash()), 'integer'); +$helper->space(); + +$v8_helper->run_checks($value, 'Checkers'); + + +$helper->header('New value creation from V8 runtime'); +$new_value = $v8_helper->CompileRun($context, "new Promise(function(){})"); +$helper->assert('New set from V8 is instance of \V8\PromiseObject', $new_value instanceof \V8\PromiseObject); +$helper->space(); + +$helper->header('Object representation'); +$helper->dump($new_value); +$helper->space(); + +$v8_helper->run_checks($new_value, 'Checkers'); + +?> +--EXPECT-- +Object representation: +---------------------- +object(V8\PromiseObject)#5 (2) { + ["isolate":"V8\Value":private]=> + object(V8\Isolate)#3 (0) { + } + ["context":"V8\ObjectValue":private]=> + object(V8\Context)#4 (1) { + ["isolate":"V8\Context":private]=> + object(V8\Isolate)#3 (0) { + } + } +} + + +PromiseObject extends Value: ok +PromiseObject does not extend PrimitiveValue: ok +PromiseObject implements AdjustableExternalMemoryInterface: ok +PromiseObject is instanceof Promise: ok + +Accessors: +---------- +V8\PromiseObject::getIsolate() matches expected value +V8\PromiseObject::getContext() matches expected value + + +Getters: +-------- +GetIdentityHash is integer: ok + + +Checkers: +--------- +V8\PromiseObject(V8\Value)->typeOf(): V8\StringValue->value(): string(6) "object" + +V8\PromiseObject(V8\ObjectValue)->isCallable(): bool(false) +V8\PromiseObject(V8\ObjectValue)->isConstructor(): bool(false) +V8\PromiseObject(V8\Value)->isUndefined(): bool(false) +V8\PromiseObject(V8\Value)->isNull(): bool(false) +V8\PromiseObject(V8\Value)->isNullOrUndefined(): bool(false) +V8\PromiseObject(V8\Value)->isTrue(): bool(false) +V8\PromiseObject(V8\Value)->isFalse(): bool(false) +V8\PromiseObject(V8\Value)->isName(): bool(false) +V8\PromiseObject(V8\Value)->isString(): bool(false) +V8\PromiseObject(V8\Value)->isSymbol(): bool(false) +V8\PromiseObject(V8\Value)->isFunction(): bool(false) +V8\PromiseObject(V8\Value)->isArray(): bool(false) +V8\PromiseObject(V8\Value)->isObject(): bool(true) +V8\PromiseObject(V8\Value)->isBoolean(): bool(false) +V8\PromiseObject(V8\Value)->isNumber(): bool(false) +V8\PromiseObject(V8\Value)->isInt32(): bool(false) +V8\PromiseObject(V8\Value)->isUint32(): bool(false) +V8\PromiseObject(V8\Value)->isDate(): bool(false) +V8\PromiseObject(V8\Value)->isArgumentsObject(): bool(false) +V8\PromiseObject(V8\Value)->isBooleanObject(): bool(false) +V8\PromiseObject(V8\Value)->isNumberObject(): bool(false) +V8\PromiseObject(V8\Value)->isStringObject(): bool(false) +V8\PromiseObject(V8\Value)->isSymbolObject(): bool(false) +V8\PromiseObject(V8\Value)->isNativeError(): bool(false) +V8\PromiseObject(V8\Value)->isRegExp(): bool(false) +V8\PromiseObject(V8\Value)->isAsyncFunction(): bool(false) +V8\PromiseObject(V8\Value)->isGeneratorFunction(): bool(false) +V8\PromiseObject(V8\Value)->isGeneratorObject(): bool(false) +V8\PromiseObject(V8\Value)->isPromise(): bool(true) +V8\PromiseObject(V8\Value)->isMap(): bool(false) +V8\PromiseObject(V8\Value)->isSet(): bool(false) +V8\PromiseObject(V8\Value)->isMapIterator(): bool(false) +V8\PromiseObject(V8\Value)->isSetIterator(): bool(false) +V8\PromiseObject(V8\Value)->isWeakMap(): bool(false) +V8\PromiseObject(V8\Value)->isWeakSet(): bool(false) +V8\PromiseObject(V8\Value)->isArrayBuffer(): bool(false) +V8\PromiseObject(V8\Value)->isArrayBufferView(): bool(false) +V8\PromiseObject(V8\Value)->isTypedArray(): bool(false) +V8\PromiseObject(V8\Value)->isUint8Array(): bool(false) +V8\PromiseObject(V8\Value)->isUint8ClampedArray(): bool(false) +V8\PromiseObject(V8\Value)->isInt8Array(): bool(false) +V8\PromiseObject(V8\Value)->isUint16Array(): bool(false) +V8\PromiseObject(V8\Value)->isInt16Array(): bool(false) +V8\PromiseObject(V8\Value)->isUint32Array(): bool(false) +V8\PromiseObject(V8\Value)->isInt32Array(): bool(false) +V8\PromiseObject(V8\Value)->isFloat32Array(): bool(false) +V8\PromiseObject(V8\Value)->isFloat64Array(): bool(false) +V8\PromiseObject(V8\Value)->isDataView(): bool(false) +V8\PromiseObject(V8\Value)->isSharedArrayBuffer(): bool(false) +V8\PromiseObject(V8\Value)->isProxy(): bool(false) + + +New value creation from V8 runtime: +----------------------------------- +New set from V8 is instance of \V8\PromiseObject: ok + + +Object representation: +---------------------- +object(V8\PromiseObject)#6 (2) { + ["isolate":"V8\Value":private]=> + object(V8\Isolate)#3 (0) { + } + ["context":"V8\ObjectValue":private]=> + object(V8\Context)#4 (1) { + ["isolate":"V8\Context":private]=> + object(V8\Isolate)#3 (0) { + } + } +} + + +Checkers: +--------- +V8\PromiseObject(V8\Value)->typeOf(): V8\StringValue->value(): string(6) "object" + +V8\PromiseObject(V8\ObjectValue)->isCallable(): bool(false) +V8\PromiseObject(V8\ObjectValue)->isConstructor(): bool(false) +V8\PromiseObject(V8\Value)->isUndefined(): bool(false) +V8\PromiseObject(V8\Value)->isNull(): bool(false) +V8\PromiseObject(V8\Value)->isNullOrUndefined(): bool(false) +V8\PromiseObject(V8\Value)->isTrue(): bool(false) +V8\PromiseObject(V8\Value)->isFalse(): bool(false) +V8\PromiseObject(V8\Value)->isName(): bool(false) +V8\PromiseObject(V8\Value)->isString(): bool(false) +V8\PromiseObject(V8\Value)->isSymbol(): bool(false) +V8\PromiseObject(V8\Value)->isFunction(): bool(false) +V8\PromiseObject(V8\Value)->isArray(): bool(false) +V8\PromiseObject(V8\Value)->isObject(): bool(true) +V8\PromiseObject(V8\Value)->isBoolean(): bool(false) +V8\PromiseObject(V8\Value)->isNumber(): bool(false) +V8\PromiseObject(V8\Value)->isInt32(): bool(false) +V8\PromiseObject(V8\Value)->isUint32(): bool(false) +V8\PromiseObject(V8\Value)->isDate(): bool(false) +V8\PromiseObject(V8\Value)->isArgumentsObject(): bool(false) +V8\PromiseObject(V8\Value)->isBooleanObject(): bool(false) +V8\PromiseObject(V8\Value)->isNumberObject(): bool(false) +V8\PromiseObject(V8\Value)->isStringObject(): bool(false) +V8\PromiseObject(V8\Value)->isSymbolObject(): bool(false) +V8\PromiseObject(V8\Value)->isNativeError(): bool(false) +V8\PromiseObject(V8\Value)->isRegExp(): bool(false) +V8\PromiseObject(V8\Value)->isAsyncFunction(): bool(false) +V8\PromiseObject(V8\Value)->isGeneratorFunction(): bool(false) +V8\PromiseObject(V8\Value)->isGeneratorObject(): bool(false) +V8\PromiseObject(V8\Value)->isPromise(): bool(true) +V8\PromiseObject(V8\Value)->isMap(): bool(false) +V8\PromiseObject(V8\Value)->isSet(): bool(false) +V8\PromiseObject(V8\Value)->isMapIterator(): bool(false) +V8\PromiseObject(V8\Value)->isSetIterator(): bool(false) +V8\PromiseObject(V8\Value)->isWeakMap(): bool(false) +V8\PromiseObject(V8\Value)->isWeakSet(): bool(false) +V8\PromiseObject(V8\Value)->isArrayBuffer(): bool(false) +V8\PromiseObject(V8\Value)->isArrayBufferView(): bool(false) +V8\PromiseObject(V8\Value)->isTypedArray(): bool(false) +V8\PromiseObject(V8\Value)->isUint8Array(): bool(false) +V8\PromiseObject(V8\Value)->isUint8ClampedArray(): bool(false) +V8\PromiseObject(V8\Value)->isInt8Array(): bool(false) +V8\PromiseObject(V8\Value)->isUint16Array(): bool(false) +V8\PromiseObject(V8\Value)->isInt16Array(): bool(false) +V8\PromiseObject(V8\Value)->isUint32Array(): bool(false) +V8\PromiseObject(V8\Value)->isInt32Array(): bool(false) +V8\PromiseObject(V8\Value)->isFloat32Array(): bool(false) +V8\PromiseObject(V8\Value)->isFloat64Array(): bool(false) +V8\PromiseObject(V8\Value)->isDataView(): bool(false) +V8\PromiseObject(V8\Value)->isSharedArrayBuffer(): bool(false) +V8\PromiseObject(V8\Value)->isProxy(): bool(false) diff --git a/tests/PromiseObject_methods.phpt b/tests/PromiseObject_methods.phpt new file mode 100644 index 0000000..8701348 --- /dev/null +++ b/tests/PromiseObject_methods.phpt @@ -0,0 +1,212 @@ +--TEST-- +V8\PromiseObject - object-specific methods +--SKIPIF-- + +--ENV-- +HOME=/tmp/we-need-home-env-var-set-to-load-valgrindrc +--FILE-- +arguments()[0]->value(), PHP_EOL; + // var_dump($args->arguments()); + $args->getReturnValue()->set(new V8\StringValue($args->getIsolate(), $args->arguments()[0]->value() . ' +')); +}); + +$catch = new \V8\FunctionObject($context, function (\V8\FunctionCallbackInfo $args) { + echo 'Caught: ', $args->arguments()[0]->value(), PHP_EOL; + // var_dump($args->arguments()); + $args->getIsolate()->throwException($args->getContext(), new V8\StringValue($args->getIsolate(), $args->arguments()[0]->value() . ' +')); +}); + + +$helper->header('Promise::then()'); +$value = new V8\PromiseObject($context); + +$helper->assert('Promise has no handlers', $value->hasHandler(), false); +$res = $value->then($context, $then); +$helper->assert('Promise has handlers', $value->hasHandler(), true); + +$helper->assert('Result of setting then is promise', $res instanceof \V8\PromiseObject); +$helper->assert('Result of setting then is not the same promise', $res !== $value); +$helper->line(); + +$helper->assert('Promise is pending', $value->state(), \V8\PromiseObject::STATE_PENDING); +$value->resolve($context, new \V8\StringValue($isolate, "resolved 1 ")); +$helper->assert('Promise is fulfilled', $value->state(), \V8\PromiseObject::STATE_FULFILLED); +$helper->inline('Promise result:', $value->result()->value()); +$res = $value->resolve($context, new \V8\StringValue($isolate, "resolved2 ")); +$helper->message('Promise handler should not be invoked on multiple resolve'); +$helper->inline('Promise result:', $value->result()->value()); +$res = $value->reject($context, new \V8\StringValue($isolate, "rejected")); +$helper->message('Promise handler should not be invoked on reject when resolved'); +$helper->inline('Promise result:', $value->result()->value()); +$helper->line(); + +$helper->header('Resolving a chain'); + +$value = new V8\PromiseObject($context); + +$v2 = $value->then($context, $then); +$v3 = $v2->then($context, $then); +$v3->then($context, $then); + +$value->resolve($context, new \V8\StringValue($isolate, "resolved 1")); +$v2->resolve($context, new \V8\StringValue($isolate, "resolved 2")); +$v3->resolve($context, new \V8\StringValue($isolate, "resolved 3")); + +$helper->line(); + +$value = new V8\PromiseObject($context); +$v2 = $value->then($context, $then); +$v3 = $v2->then($context, $then); +$v3->then($context, $then); + +$v2->resolve($context, new \V8\StringValue($isolate, "resolved 2")); +$v3->resolve($context, new \V8\StringValue($isolate, "resolved 3")); +$value->resolve($context, new \V8\StringValue($isolate, "resolved 1")); + +$helper->line(); + +$value = new V8\PromiseObject($context); +$v2 = $value->then($context, $then); +$v3 = $v2->then($context, $then); +$v3->then($context, $then); + +$v3->resolve($context, new \V8\StringValue($isolate, "resolved 3")); +$v2->resolve($context, new \V8\StringValue($isolate, "resolved 2")); +$value->resolve($context, new \V8\StringValue($isolate, "resolved 1")); +$helper->space(); + + + +$helper->header('Promise::catch()'); +$value = new V8\PromiseObject($context); + +$helper->assert('Promise has no handlers', $value->hasHandler(), false); +$res = $value->catch($context, $catch); +$helper->assert('Promise has handlers', $value->hasHandler(), true); + +$helper->assert('Result of setting catch is promise', $res instanceof \V8\PromiseObject); +$helper->assert('Result of setting catch is not the same promise', $res !== $value); +$helper->line(); + +$helper->assert('Promise is pending', $value->state(), \V8\PromiseObject::STATE_PENDING); +$value->reject($context, new \V8\StringValue($isolate, "rejected 1")); +$helper->assert('Promise is rejected', $value->state(), \V8\PromiseObject::STATE_REJECTED); +$helper->inline('Promise result:', $value->result()->value()); +$res = $value->resolve($context, new \V8\StringValue($isolate, "rejected 2")); +$helper->message('Promise handler should not be invoked on multiple reject'); +$helper->inline('Promise result:', $value->result()->value()); +$res = $value->resolve($context, new \V8\StringValue($isolate, "resolved")); +$helper->message('Promise handler should not be invoked on resolve when rejected'); +$helper->inline('Promise result:', $value->result()->value()); + +$helper->line(); + +$helper->header('Rejecting a chain'); + +$value = new V8\PromiseObject($context); +$v2 = $value->catch($context, $catch); +$v3 = $v2->catch($context, $catch); +$v3->catch($context, $catch); + +$value->reject($context, new \V8\StringValue($isolate, "rejected 1")); +$v2->reject($context, new \V8\StringValue($isolate, "rejected 2")); +$v3->reject($context, new \V8\StringValue($isolate, "rejected 3")); + +$helper->line(); + +$value = new V8\PromiseObject($context); +$v2 = $value->catch($context, $catch); +$v3 = $v2->catch($context, $catch); +$v3->catch($context, $catch); + +$v2->reject($context, new \V8\StringValue($isolate, "rejected 2")); +$v3->reject($context, new \V8\StringValue($isolate, "rejected 3")); +$value->reject($context, new \V8\StringValue($isolate, "rejected 1")); + +$helper->line(); + +$value = new V8\PromiseObject($context); +$v2 = $value->catch($context, $catch); +$v3 = $v2->catch($context, $catch); +$v3->catch($context, $catch); + +$v3->reject($context, new \V8\StringValue($isolate, "rejected 3")); +$v2->reject($context, new \V8\StringValue($isolate, "rejected 2")); +$value->reject($context, new \V8\StringValue($isolate, "rejected 1")); + + +?> +--EXPECT-- +Promise::then(): +---------------- +Promise has no handlers: ok +Promise has handlers: ok +Result of setting then is promise: ok +Result of setting then is not the same promise: ok + +Promise is pending: ok +Resolved: resolved 1 +Promise is fulfilled: ok +Promise result:: resolved 1 +Promise handler should not be invoked on multiple resolve +Promise result:: resolved2 +Promise handler should not be invoked on reject when resolved +Promise result:: rejected + +Resolving a chain: +------------------ +Resolved: resolved 1 +Resolved: resolved 1 + +Resolved: resolved 1 + + + +Resolved: resolved 2 +Resolved: resolved 2 + +Resolved: resolved 1 + +Resolved: resolved 3 +Resolved: resolved 2 +Resolved: resolved 1 + + +Promise::catch(): +----------------- +Promise has no handlers: ok +Promise has handlers: ok +Result of setting catch is promise: ok +Result of setting catch is not the same promise: ok + +Promise is pending: ok +Caught: rejected 1 +Promise is rejected: ok +Promise result:: rejected 1 +Promise handler should not be invoked on multiple reject +Promise result:: rejected 2 +Promise handler should not be invoked on resolve when rejected +Promise result:: resolved + +Rejecting a chain: +------------------ +Caught: rejected 1 +Caught: rejected 1 + +Caught: rejected 1 + + + +Caught: rejected 2 +Caught: rejected 2 + +Caught: rejected 1 + +Caught: rejected 3 +Caught: rejected 2 +Caught: rejected 1 diff --git a/tests/ProxyObject.phpt b/tests/ProxyObject.phpt new file mode 100644 index 0000000..2da6e48 --- /dev/null +++ b/tests/ProxyObject.phpt @@ -0,0 +1,220 @@ +--TEST-- +V8\ProxyObject +--SKIPIF-- + +--ENV-- +HOME=/tmp/we-need-home-env-var-set-to-load-valgrindrc +--FILE-- +header('Object representation'); +$helper->dump($value); +$helper->space(); + +$helper->assert('ProxyObject extends Value', $value instanceof \V8\Value); +$helper->assert('ProxyObject does not extend PrimitiveValue', !($value instanceof \V8\PrimitiveValue)); +$helper->assert('ProxyObject implements AdjustableExternalMemoryInterface', $value instanceof \V8\AdjustableExternalMemoryInterface); +$helper->assert('ProxyObject is instanceof Proxy', $value->instanceOf($context, $context->globalObject()->get($context, new \V8\StringValue($isolate, 'Proxy')))); +$helper->line(); + +$helper->header('Accessors'); +$helper->method_matches($value, 'getIsolate', $isolate); +$helper->method_matches($value, 'getContext', $context); +$helper->space(); + +$helper->header('Getters'); +$helper->assert('GetIdentityHash is integer', gettype($value->getIdentityHash()), 'integer'); +$helper->space(); + +$v8_helper->run_checks($value, 'Checkers'); + + +$helper->header('New value creation from V8 runtime'); +$new_value = $v8_helper->CompileRun($context, "new Proxy({}, {})"); +$helper->assert('New set from V8 is instance of \V8\ProxyObject', $new_value instanceof \V8\ProxyObject); +$helper->space(); + +$helper->header('Object representation'); +$helper->dump($new_value); +$helper->space(); + +$v8_helper->run_checks($new_value, 'Checkers'); + +?> +--EXPECT-- +Object representation: +---------------------- +object(V8\ProxyObject)#7 (2) { + ["isolate":"V8\Value":private]=> + object(V8\Isolate)#3 (0) { + } + ["context":"V8\ObjectValue":private]=> + object(V8\Context)#4 (1) { + ["isolate":"V8\Context":private]=> + object(V8\Isolate)#3 (0) { + } + } +} + + +ProxyObject extends Value: ok +ProxyObject does not extend PrimitiveValue: ok +ProxyObject implements AdjustableExternalMemoryInterface: ok +ProxyObject is instanceof Proxy: failed + +Accessors: +---------- +V8\ProxyObject::getIsolate() matches expected value +V8\ProxyObject::getContext() matches expected value + + +Getters: +-------- +GetIdentityHash is integer: ok + + +Checkers: +--------- +V8\ProxyObject(V8\Value)->typeOf(): V8\StringValue->value(): string(6) "object" + +V8\ProxyObject->isRevoked(): bool(false) +V8\ProxyObject(V8\ObjectValue)->isCallable(): bool(false) +V8\ProxyObject(V8\ObjectValue)->isConstructor(): bool(false) +V8\ProxyObject(V8\Value)->isUndefined(): bool(false) +V8\ProxyObject(V8\Value)->isNull(): bool(false) +V8\ProxyObject(V8\Value)->isNullOrUndefined(): bool(false) +V8\ProxyObject(V8\Value)->isTrue(): bool(false) +V8\ProxyObject(V8\Value)->isFalse(): bool(false) +V8\ProxyObject(V8\Value)->isName(): bool(false) +V8\ProxyObject(V8\Value)->isString(): bool(false) +V8\ProxyObject(V8\Value)->isSymbol(): bool(false) +V8\ProxyObject(V8\Value)->isFunction(): bool(false) +V8\ProxyObject(V8\Value)->isArray(): bool(false) +V8\ProxyObject(V8\Value)->isObject(): bool(true) +V8\ProxyObject(V8\Value)->isBoolean(): bool(false) +V8\ProxyObject(V8\Value)->isNumber(): bool(false) +V8\ProxyObject(V8\Value)->isInt32(): bool(false) +V8\ProxyObject(V8\Value)->isUint32(): bool(false) +V8\ProxyObject(V8\Value)->isDate(): bool(false) +V8\ProxyObject(V8\Value)->isArgumentsObject(): bool(false) +V8\ProxyObject(V8\Value)->isBooleanObject(): bool(false) +V8\ProxyObject(V8\Value)->isNumberObject(): bool(false) +V8\ProxyObject(V8\Value)->isStringObject(): bool(false) +V8\ProxyObject(V8\Value)->isSymbolObject(): bool(false) +V8\ProxyObject(V8\Value)->isNativeError(): bool(false) +V8\ProxyObject(V8\Value)->isRegExp(): bool(false) +V8\ProxyObject(V8\Value)->isAsyncFunction(): bool(false) +V8\ProxyObject(V8\Value)->isGeneratorFunction(): bool(false) +V8\ProxyObject(V8\Value)->isGeneratorObject(): bool(false) +V8\ProxyObject(V8\Value)->isPromise(): bool(false) +V8\ProxyObject(V8\Value)->isMap(): bool(false) +V8\ProxyObject(V8\Value)->isSet(): bool(false) +V8\ProxyObject(V8\Value)->isMapIterator(): bool(false) +V8\ProxyObject(V8\Value)->isSetIterator(): bool(false) +V8\ProxyObject(V8\Value)->isWeakMap(): bool(false) +V8\ProxyObject(V8\Value)->isWeakSet(): bool(false) +V8\ProxyObject(V8\Value)->isArrayBuffer(): bool(false) +V8\ProxyObject(V8\Value)->isArrayBufferView(): bool(false) +V8\ProxyObject(V8\Value)->isTypedArray(): bool(false) +V8\ProxyObject(V8\Value)->isUint8Array(): bool(false) +V8\ProxyObject(V8\Value)->isUint8ClampedArray(): bool(false) +V8\ProxyObject(V8\Value)->isInt8Array(): bool(false) +V8\ProxyObject(V8\Value)->isUint16Array(): bool(false) +V8\ProxyObject(V8\Value)->isInt16Array(): bool(false) +V8\ProxyObject(V8\Value)->isUint32Array(): bool(false) +V8\ProxyObject(V8\Value)->isInt32Array(): bool(false) +V8\ProxyObject(V8\Value)->isFloat32Array(): bool(false) +V8\ProxyObject(V8\Value)->isFloat64Array(): bool(false) +V8\ProxyObject(V8\Value)->isDataView(): bool(false) +V8\ProxyObject(V8\Value)->isSharedArrayBuffer(): bool(false) +V8\ProxyObject(V8\Value)->isProxy(): bool(true) + + +New value creation from V8 runtime: +----------------------------------- +New set from V8 is instance of \V8\ProxyObject: ok + + +Object representation: +---------------------- +object(V8\ProxyObject)#8 (2) { + ["isolate":"V8\Value":private]=> + object(V8\Isolate)#3 (0) { + } + ["context":"V8\ObjectValue":private]=> + object(V8\Context)#4 (1) { + ["isolate":"V8\Context":private]=> + object(V8\Isolate)#3 (0) { + } + } +} + + +Checkers: +--------- +V8\ProxyObject(V8\Value)->typeOf(): V8\StringValue->value(): string(6) "object" + +V8\ProxyObject->isRevoked(): bool(false) +V8\ProxyObject(V8\ObjectValue)->isCallable(): bool(false) +V8\ProxyObject(V8\ObjectValue)->isConstructor(): bool(false) +V8\ProxyObject(V8\Value)->isUndefined(): bool(false) +V8\ProxyObject(V8\Value)->isNull(): bool(false) +V8\ProxyObject(V8\Value)->isNullOrUndefined(): bool(false) +V8\ProxyObject(V8\Value)->isTrue(): bool(false) +V8\ProxyObject(V8\Value)->isFalse(): bool(false) +V8\ProxyObject(V8\Value)->isName(): bool(false) +V8\ProxyObject(V8\Value)->isString(): bool(false) +V8\ProxyObject(V8\Value)->isSymbol(): bool(false) +V8\ProxyObject(V8\Value)->isFunction(): bool(false) +V8\ProxyObject(V8\Value)->isArray(): bool(false) +V8\ProxyObject(V8\Value)->isObject(): bool(true) +V8\ProxyObject(V8\Value)->isBoolean(): bool(false) +V8\ProxyObject(V8\Value)->isNumber(): bool(false) +V8\ProxyObject(V8\Value)->isInt32(): bool(false) +V8\ProxyObject(V8\Value)->isUint32(): bool(false) +V8\ProxyObject(V8\Value)->isDate(): bool(false) +V8\ProxyObject(V8\Value)->isArgumentsObject(): bool(false) +V8\ProxyObject(V8\Value)->isBooleanObject(): bool(false) +V8\ProxyObject(V8\Value)->isNumberObject(): bool(false) +V8\ProxyObject(V8\Value)->isStringObject(): bool(false) +V8\ProxyObject(V8\Value)->isSymbolObject(): bool(false) +V8\ProxyObject(V8\Value)->isNativeError(): bool(false) +V8\ProxyObject(V8\Value)->isRegExp(): bool(false) +V8\ProxyObject(V8\Value)->isAsyncFunction(): bool(false) +V8\ProxyObject(V8\Value)->isGeneratorFunction(): bool(false) +V8\ProxyObject(V8\Value)->isGeneratorObject(): bool(false) +V8\ProxyObject(V8\Value)->isPromise(): bool(false) +V8\ProxyObject(V8\Value)->isMap(): bool(false) +V8\ProxyObject(V8\Value)->isSet(): bool(false) +V8\ProxyObject(V8\Value)->isMapIterator(): bool(false) +V8\ProxyObject(V8\Value)->isSetIterator(): bool(false) +V8\ProxyObject(V8\Value)->isWeakMap(): bool(false) +V8\ProxyObject(V8\Value)->isWeakSet(): bool(false) +V8\ProxyObject(V8\Value)->isArrayBuffer(): bool(false) +V8\ProxyObject(V8\Value)->isArrayBufferView(): bool(false) +V8\ProxyObject(V8\Value)->isTypedArray(): bool(false) +V8\ProxyObject(V8\Value)->isUint8Array(): bool(false) +V8\ProxyObject(V8\Value)->isUint8ClampedArray(): bool(false) +V8\ProxyObject(V8\Value)->isInt8Array(): bool(false) +V8\ProxyObject(V8\Value)->isUint16Array(): bool(false) +V8\ProxyObject(V8\Value)->isInt16Array(): bool(false) +V8\ProxyObject(V8\Value)->isUint32Array(): bool(false) +V8\ProxyObject(V8\Value)->isInt32Array(): bool(false) +V8\ProxyObject(V8\Value)->isFloat32Array(): bool(false) +V8\ProxyObject(V8\Value)->isFloat64Array(): bool(false) +V8\ProxyObject(V8\Value)->isDataView(): bool(false) +V8\ProxyObject(V8\Value)->isSharedArrayBuffer(): bool(false) +V8\ProxyObject(V8\Value)->isProxy(): bool(true) diff --git a/tests/ProxyObject_methods.phpt b/tests/ProxyObject_methods.phpt new file mode 100644 index 0000000..6d53e6f --- /dev/null +++ b/tests/ProxyObject_methods.phpt @@ -0,0 +1,39 @@ +--TEST-- +V8\ProxyObject +--SKIPIF-- + +--ENV-- +HOME=/tmp/we-need-home-env-var-set-to-load-valgrindrc +--FILE-- +assert('Proxy returns valid target', $value->getTarget(), $target); +$helper->assert('Proxy returns valid handler', $value->getHandler(), $handler); +$helper->assert('Proxy is not revoked', $value->isRevoked(), false); +$value->revoke(); +$helper->assert('Proxy is now revoked', $value->isRevoked(), true); +$helper->assert('Proxy returns valid target', $value->getTarget(), $target); +$helper->assert('Proxy returns null handler', $value->getHandler() instanceof V8\NullValue); + + +?> +--EXPECT-- +Proxy returns valid target: ok +Proxy returns valid handler: ok +Proxy is not revoked: ok +Proxy is now revoked: ok +Proxy returns valid target: ok +Proxy returns null handler: ok diff --git a/v8.cc b/v8.cc index 17574b9..736a5e8 100644 --- a/v8.cc +++ b/v8.cc @@ -53,6 +53,8 @@ #include "php_v8_set.h" #include "php_v8_date.h" #include "php_v8_regexp.h" +#include "php_v8_proxy.h" +#include "php_v8_promise.h" #include "php_v8_number_object.h" #include "php_v8_boolean_object.h" #include "php_v8_string_object.h" @@ -145,6 +147,8 @@ PHP_MINIT_FUNCTION(v8) PHP_MINIT(php_v8_set)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(php_v8_date)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(php_v8_regexp)(INIT_FUNC_ARGS_PASSTHRU); + PHP_MINIT(php_v8_promise)(INIT_FUNC_ARGS_PASSTHRU); + PHP_MINIT(php_v8_proxy)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(php_v8_number_object)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(php_v8_boolean_object)(INIT_FUNC_ARGS_PASSTHRU); From 371b3543073ddc2197f77cbba923838f73278957 Mon Sep 17 00:00:00 2001 From: Bogdan Padalko Date: Sat, 16 Sep 2017 14:01:01 +0300 Subject: [PATCH 4/7] Add support for regexp dotAll flag, closes #54 --- src/php_v8_regexp.cc | 1 + stubs/src/RegExp/Flags.php | 1 + tests/001-verify_extension_entities.phpt | 1 + tests/002-enums.phpt | 1 + 4 files changed, 4 insertions(+) diff --git a/src/php_v8_regexp.cc b/src/php_v8_regexp.cc index 0d48f9e..7fa8e6a 100644 --- a/src/php_v8_regexp.cc +++ b/src/php_v8_regexp.cc @@ -125,6 +125,7 @@ PHP_MINIT_FUNCTION(php_v8_regexp) { zend_declare_class_constant_long(this_ce, ZEND_STRL("MULTILINE"), v8::RegExp::Flags::kMultiline); zend_declare_class_constant_long(this_ce, ZEND_STRL("STICKY"), v8::RegExp::Flags::kSticky); zend_declare_class_constant_long(this_ce, ZEND_STRL("UNICODE"), v8::RegExp::Flags::kUnicode); + zend_declare_class_constant_long(this_ce, ZEND_STRL("DOTALL"), v8::RegExp::Flags::kDotAll); return SUCCESS; } diff --git a/stubs/src/RegExp/Flags.php b/stubs/src/RegExp/Flags.php index 3571c10..0088c0d 100644 --- a/stubs/src/RegExp/Flags.php +++ b/stubs/src/RegExp/Flags.php @@ -24,4 +24,5 @@ class Flags const MULTILINE = 4; const STICKY = 8; const UNICODE = 16; + const DOTALL = 32; } diff --git a/tests/001-verify_extension_entities.phpt b/tests/001-verify_extension_entities.phpt index eac4ee5..4e09b31 100644 --- a/tests/001-verify_extension_entities.phpt +++ b/tests/001-verify_extension_entities.phpt @@ -770,6 +770,7 @@ final class V8\RegExpObject\Flags const MULTILINE = 4 const STICKY = 8 const UNICODE = 16 + const DOTALL = 32 class V8\PromiseObject extends V8\ObjectValue diff --git a/tests/002-enums.phpt b/tests/002-enums.phpt index 216cfc3..dd1bef1 100644 --- a/tests/002-enums.phpt +++ b/tests/002-enums.phpt @@ -167,6 +167,7 @@ V8\RegExpObject\Flags::IGNORE_CASE = 2 V8\RegExpObject\Flags::MULTILINE = 4 V8\RegExpObject\Flags::STICKY = 8 V8\RegExpObject\Flags::UNICODE = 16 +V8\RegExpObject\Flags::DOTALL = 32 Object representation: From 88dc5076f75aacff9bb471b5907f356da04a6dfc Mon Sep 17 00:00:00 2001 From: Bogdan Padalko Date: Sat, 16 Sep 2017 14:14:13 +0300 Subject: [PATCH 5/7] Move RegExpObject\Flags constants under RegExpObject, closes #64 --- src/php_v8_regexp.cc | 25 ++++++--------------- src/php_v8_regexp.h | 11 ++++++++-- stubs/src/RegExp/Flags.php | 28 ------------------------ stubs/src/RegExpObject.php | 9 +++++++- tests/001-verify_extension_entities.phpt | 16 ++++++-------- tests/002-enums.phpt | 21 +----------------- tests/RegExpObject.phpt | 17 +++++++++++++- 7 files changed, 48 insertions(+), 79 deletions(-) delete mode 100644 stubs/src/RegExp/Flags.php diff --git a/src/php_v8_regexp.cc b/src/php_v8_regexp.cc index 7fa8e6a..3e44722 100644 --- a/src/php_v8_regexp.cc +++ b/src/php_v8_regexp.cc @@ -22,7 +22,6 @@ #include "php_v8.h" zend_class_entry *php_v8_regexp_class_entry; -zend_class_entry *php_v8_regexp_flags_class_entry; #define this_ce php_v8_regexp_class_entry @@ -103,29 +102,19 @@ static const zend_function_entry php_v8_regexp_methods[] = { PHP_FE_END }; -static const zend_function_entry php_v8_regexp_flags_methods[] = { - PHP_FE_END -}; PHP_MINIT_FUNCTION(php_v8_regexp) { zend_class_entry ce; INIT_NS_CLASS_ENTRY(ce, PHP_V8_NS, "RegExpObject", php_v8_regexp_methods); this_ce = zend_register_internal_class_ex(&ce, php_v8_object_class_entry); - #undef this_ce - #define this_ce php_v8_regexp_flags_class_entry - - INIT_NS_CLASS_ENTRY(ce, "V8\\RegExpObject", "Flags", php_v8_regexp_flags_methods); - this_ce = zend_register_internal_class(&ce); - this_ce->ce_flags |= ZEND_ACC_FINAL; - - zend_declare_class_constant_long(this_ce, ZEND_STRL("NONE"), v8::RegExp::Flags::kNone); - zend_declare_class_constant_long(this_ce, ZEND_STRL("GLOBAL"), v8::RegExp::Flags::kGlobal); - zend_declare_class_constant_long(this_ce, ZEND_STRL("IGNORE_CASE"), v8::RegExp::Flags::kIgnoreCase); - zend_declare_class_constant_long(this_ce, ZEND_STRL("MULTILINE"), v8::RegExp::Flags::kMultiline); - zend_declare_class_constant_long(this_ce, ZEND_STRL("STICKY"), v8::RegExp::Flags::kSticky); - zend_declare_class_constant_long(this_ce, ZEND_STRL("UNICODE"), v8::RegExp::Flags::kUnicode); - zend_declare_class_constant_long(this_ce, ZEND_STRL("DOTALL"), v8::RegExp::Flags::kDotAll); + zend_declare_class_constant_long(this_ce, ZEND_STRL("FLAG_NONE"), v8::RegExp::Flags::kNone); + zend_declare_class_constant_long(this_ce, ZEND_STRL("FLAG_GLOBAL"), v8::RegExp::Flags::kGlobal); + zend_declare_class_constant_long(this_ce, ZEND_STRL("FLAG_IGNORE_CASE"), v8::RegExp::Flags::kIgnoreCase); + zend_declare_class_constant_long(this_ce, ZEND_STRL("FLAG_MULTILINE"), v8::RegExp::Flags::kMultiline); + zend_declare_class_constant_long(this_ce, ZEND_STRL("FLAG_STICKY"), v8::RegExp::Flags::kSticky); + zend_declare_class_constant_long(this_ce, ZEND_STRL("FLAG_UNICODE"), v8::RegExp::Flags::kUnicode); + zend_declare_class_constant_long(this_ce, ZEND_STRL("FLAG_DOTALL"), v8::RegExp::Flags::kDotAll); return SUCCESS; } diff --git a/src/php_v8_regexp.h b/src/php_v8_regexp.h index 34f4185..c6cf8f6 100644 --- a/src/php_v8_regexp.h +++ b/src/php_v8_regexp.h @@ -25,10 +25,17 @@ extern "C" { } extern zend_class_entry* php_v8_regexp_class_entry; -extern zend_class_entry* php_v8_regexp_flags_class_entry; -#define PHP_V8_REGEXP_FLAGS (v8::RegExp::Flags::kNone | v8::RegExp::Flags::kGlobal | v8::RegExp::Flags::kIgnoreCase | v8::RegExp::Flags::kMultiline | v8::RegExp::Flags::kSticky | v8::RegExp::Flags::kUnicode) +#define PHP_V8_REGEXP_FLAGS ( 0 \ + | v8::RegExp::Flags::kNone \ + | v8::RegExp::Flags::kGlobal \ + | v8::RegExp::Flags::kIgnoreCase \ + | v8::RegExp::Flags::kMultiline \ + | v8::RegExp::Flags::kSticky \ + | v8::RegExp::Flags::kUnicode \ + | v8::RegExp::Flags::kDotAll \ +) PHP_MINIT_FUNCTION(php_v8_regexp); diff --git a/stubs/src/RegExp/Flags.php b/stubs/src/RegExp/Flags.php deleted file mode 100644 index 0088c0d..0000000 --- a/stubs/src/RegExp/Flags.php +++ /dev/null @@ -1,28 +0,0 @@ - - * - * Licensed under the MIT license: http://opensource.org/licenses/MIT - * - * For the full copyright and license information, please view the - * LICENSE file that was distributed with this source or visit - * http://opensource.org/licenses/MIT - */ - - -namespace V8\RegExpObject; - - -class Flags -{ - const NONE = 0; - const GLOBAL = 1; - const IGNORE_CASE = 2; - const MULTILINE = 4; - const STICKY = 8; - const UNICODE = 16; - const DOTALL = 32; -} diff --git a/stubs/src/RegExpObject.php b/stubs/src/RegExpObject.php index d2c12b2..909fec9 100644 --- a/stubs/src/RegExpObject.php +++ b/stubs/src/RegExpObject.php @@ -18,13 +18,20 @@ class RegExpObject extends ObjectValue { + const FLAG_NONE = 0; + const FLAG_GLOBAL = 1; + const FLAG_IGNORE_CASE = 2; + const FLAG_MULTILINE = 4; + const FLAG_STICKY = 8; + const FLAG_UNICODE = 16; + const FLAG_DOTALL = 32; /** * @param \V8\Context $context * @param StringValue $pattern * @param int $flags */ - public function __construct(Context $context, StringValue $pattern, int $flags = RegExpObject\Flags::NONE) + public function __construct(Context $context, StringValue $pattern, int $flags = RegExpObject::FLAG_NONE) { parent::__construct($context); } diff --git a/tests/001-verify_extension_entities.phpt b/tests/001-verify_extension_entities.phpt index 4e09b31..4930f9f 100644 --- a/tests/001-verify_extension_entities.phpt +++ b/tests/001-verify_extension_entities.phpt @@ -759,19 +759,17 @@ class V8\DateObject class V8\RegExpObject extends V8\ObjectValue implements V8\AdjustableExternalMemoryInterface + const FLAG_NONE = 0 + const FLAG_GLOBAL = 1 + const FLAG_IGNORE_CASE = 2 + const FLAG_MULTILINE = 4 + const FLAG_STICKY = 8 + const FLAG_UNICODE = 16 + const FLAG_DOTALL = 32 public function __construct(V8\Context $context, V8\StringValue $context, ?int $flags) public function getSource(): V8\StringValue public function getFlags(): int -final class V8\RegExpObject\Flags - const NONE = 0 - const GLOBAL = 1 - const IGNORE_CASE = 2 - const MULTILINE = 4 - const STICKY = 8 - const UNICODE = 16 - const DOTALL = 32 - class V8\PromiseObject extends V8\ObjectValue implements V8\AdjustableExternalMemoryInterface diff --git a/tests/002-enums.phpt b/tests/002-enums.phpt index dd1bef1..d6efe24 100644 --- a/tests/002-enums.phpt +++ b/tests/002-enums.phpt @@ -19,7 +19,6 @@ $enums = [ new V8\PropertyFilter(), new V8\KeyCollectionMode(), new V8\IndexFilter(), - new V8\RegExpObject\Flags(), new V8\ScriptCompiler\CompileOptions(), ]; @@ -155,25 +154,7 @@ V8\IndexFilter::SKIP_INDICES = 1 Object representation: ---------------------- Class is final: ok -object(V8\RegExpObject\Flags)#10 (0) { -} - - -Class constants: ----------------- -V8\RegExpObject\Flags::NONE = 0 -V8\RegExpObject\Flags::GLOBAL = 1 -V8\RegExpObject\Flags::IGNORE_CASE = 2 -V8\RegExpObject\Flags::MULTILINE = 4 -V8\RegExpObject\Flags::STICKY = 8 -V8\RegExpObject\Flags::UNICODE = 16 -V8\RegExpObject\Flags::DOTALL = 32 - - -Object representation: ----------------------- -Class is final: ok -object(V8\ScriptCompiler\CompileOptions)#11 (0) { +object(V8\ScriptCompiler\CompileOptions)#10 (0) { } diff --git a/tests/RegExpObject.phpt b/tests/RegExpObject.phpt index 616c8cc..9e41ff7 100644 --- a/tests/RegExpObject.phpt +++ b/tests/RegExpObject.phpt @@ -19,7 +19,7 @@ $isolate = new \V8\Isolate(); $context = new V8\Context($isolate); $v8_helper->injectConsoleLog($context); -$value = new V8\RegExpObject($context, new \V8\StringValue($isolate, '([a-z]{1,4})-([0-9]+)'), \V8\RegExpObject\Flags::IGNORE_CASE); +$value = new V8\RegExpObject($context, new \V8\StringValue($isolate, '([a-z]{1,4})-([0-9]+)'), \V8\RegExpObject::FLAG_IGNORE_CASE); $helper->header('Object representation'); $helper->dump($value); @@ -28,6 +28,10 @@ $helper->space(); $helper->assert('RegExpObject extends ObjectValue', $value instanceof \V8\ObjectValue); $helper->line(); +$helper->header('Getters'); +$helper->dump_object_constants($value); +$helper->space(); + $helper->header('Getters'); $helper->pretty_dump(get_class($value) . '->getSource()->value()', $value->getSource()->value()); $helper->method_export($value, 'getFlags'); @@ -75,6 +79,17 @@ object(V8\RegExpObject)#6 (2) { RegExpObject extends ObjectValue: ok +Getters: +-------- +V8\RegExpObject::FLAG_NONE = 0 +V8\RegExpObject::FLAG_GLOBAL = 1 +V8\RegExpObject::FLAG_IGNORE_CASE = 2 +V8\RegExpObject::FLAG_MULTILINE = 4 +V8\RegExpObject::FLAG_STICKY = 8 +V8\RegExpObject::FLAG_UNICODE = 16 +V8\RegExpObject::FLAG_DOTALL = 32 + + Getters: -------- V8\RegExpObject->getSource()->value(): string(21) "([a-z]{1,4})-([0-9]+)" From 8c67a74a577dd9bb9663a1dd19f8ff5dbfde9f3d Mon Sep 17 00:00:00 2001 From: Bogdan Padalko Date: Sat, 16 Sep 2017 14:24:51 +0300 Subject: [PATCH 6/7] Move CompileOptions constants under ScriptCompiler, closes #65. --- src/php_v8_script_compiler.cc | 26 ++++++---------------- src/php_v8_script_compiler.h | 1 - stubs/src/ScriptCompiler.php | 4 ++-- tests/001-verify_extension_entities.phpt | 12 +++++----- tests/002-enums.phpt | 17 -------------- tests/ScriptCompiler_compile.phpt | 28 ++++++++++++------------ tests/ScriptCompiler_compileUnbound.phpt | 22 +++++++++---------- 7 files changed, 39 insertions(+), 71 deletions(-) diff --git a/src/php_v8_script_compiler.cc b/src/php_v8_script_compiler.cc index ff77218..ea305ae 100644 --- a/src/php_v8_script_compiler.cc +++ b/src/php_v8_script_compiler.cc @@ -27,7 +27,6 @@ #include "php_v8.h" zend_class_entry* php_v8_script_compiler_class_entry; -zend_class_entry* php_v8_compile_options_class_entry; #define this_ce php_v8_script_compiler_class_entry @@ -81,7 +80,7 @@ static PHP_METHOD(ScriptCompiler, compileUnboundScript) return; } - PHP_V8_CHECK_COMPILER_OPTIONS_RANGE(options, "Invalid Script compiler options given. See V8\\ScriptCompiler\\CompileOptions class constants for available options.") + PHP_V8_CHECK_COMPILER_OPTIONS_RANGE(options, "Invalid Script compiler options given. See V8\\ScriptCompiler OPTION_* class constants for available options.") PHP_V8_CONTEXT_FETCH_WITH_CHECK(php_v8_context_zv, php_v8_context); @@ -137,7 +136,7 @@ static PHP_METHOD(ScriptCompiler, compile) return; } - PHP_V8_CHECK_COMPILER_OPTIONS_RANGE(options, "Invalid Script compiler options given. See V8\\ScriptCompiler\\CompileOptions class constants for available options.") + PHP_V8_CHECK_COMPILER_OPTIONS_RANGE(options, "Invalid Script compiler options given. See V8\\ScriptCompiler OPTION_* class constants for available options.") PHP_V8_CONTEXT_FETCH_WITH_CHECK(php_v8_context_zv, php_v8_context); @@ -285,10 +284,6 @@ static const zend_function_entry php_v8_script_compiler_methods[] = { PHP_FE_END }; -static const zend_function_entry php_v8_compile_options_methods[] = { - PHP_FE_END -}; - PHP_MINIT_FUNCTION(php_v8_script_compiler) { @@ -297,18 +292,11 @@ PHP_MINIT_FUNCTION(php_v8_script_compiler) INIT_NS_CLASS_ENTRY(ce, PHP_V8_NS, "ScriptCompiler", php_v8_script_compiler_methods); this_ce = zend_register_internal_class(&ce); - #undef this_ce - #define this_ce php_v8_compile_options_class_entry - - INIT_NS_CLASS_ENTRY(ce, "V8\\ScriptCompiler", "CompileOptions", php_v8_compile_options_methods); - this_ce = zend_register_internal_class(&ce); - this_ce->ce_flags |= ZEND_ACC_FINAL; - - zend_declare_class_constant_long(this_ce, ZEND_STRL("NO_COMPILE_OPTIONS"), v8::ScriptCompiler::CompileOptions::kNoCompileOptions); - zend_declare_class_constant_long(this_ce, ZEND_STRL("PRODUCE_PARSER_CACHE"), v8::ScriptCompiler::CompileOptions::kProduceParserCache); - zend_declare_class_constant_long(this_ce, ZEND_STRL("CONSUME_PARSER_CACHE"), v8::ScriptCompiler::CompileOptions::kConsumeParserCache); - zend_declare_class_constant_long(this_ce, ZEND_STRL("PRODUCE_CODE_CACHE"), v8::ScriptCompiler::CompileOptions::kProduceCodeCache); - zend_declare_class_constant_long(this_ce, ZEND_STRL("CONSUME_CODE_CACHE"), v8::ScriptCompiler::CompileOptions::kConsumeCodeCache); + zend_declare_class_constant_long(this_ce, ZEND_STRL("OPTION_NO_COMPILE_OPTIONS"), static_cast(v8::ScriptCompiler::CompileOptions::kNoCompileOptions)); + zend_declare_class_constant_long(this_ce, ZEND_STRL("OPTION_PRODUCE_PARSER_CACHE"), static_cast(v8::ScriptCompiler::CompileOptions::kProduceParserCache)); + zend_declare_class_constant_long(this_ce, ZEND_STRL("OPTION_CONSUME_PARSER_CACHE"), static_cast(v8::ScriptCompiler::CompileOptions::kConsumeParserCache)); + zend_declare_class_constant_long(this_ce, ZEND_STRL("OPTION_PRODUCE_CODE_CACHE"), static_cast(v8::ScriptCompiler::CompileOptions::kProduceCodeCache)); + zend_declare_class_constant_long(this_ce, ZEND_STRL("OPTION_CONSUME_CODE_CACHE"), static_cast(v8::ScriptCompiler::CompileOptions::kConsumeCodeCache)); return SUCCESS; } diff --git a/src/php_v8_script_compiler.h b/src/php_v8_script_compiler.h index 0892bbc..9c6634a 100644 --- a/src/php_v8_script_compiler.h +++ b/src/php_v8_script_compiler.h @@ -22,7 +22,6 @@ extern "C" { } extern zend_class_entry *php_v8_script_compiler_class_entry; -extern zend_class_entry* php_v8_compile_options_class_entry; #define PHP_V8_CHECK_COMPILER_OPTIONS_RANGE(options, message) \ if (options < static_cast(v8::ScriptCompiler::CompileOptions::kNoCompileOptions) \ diff --git a/stubs/src/ScriptCompiler.php b/stubs/src/ScriptCompiler.php index e24937b..ca79843 100644 --- a/stubs/src/ScriptCompiler.php +++ b/stubs/src/ScriptCompiler.php @@ -59,7 +59,7 @@ public static function cachedDataVersionTag(): int * * @return UnboundScript */ - public static function compileUnboundScript(Context $context, Source $source, int $options = CompileOptions::NO_COMPILE_OPTIONS): UnboundScript + public static function compileUnboundScript(Context $context, Source $source, int $options = ScriptCompiler::OPTION_NO_COMPILE_OPTIONS): UnboundScript { } @@ -80,7 +80,7 @@ public static function compileUnboundScript(Context $context, Source $source, in * * @return Script */ - public static function compile(Context $context, Source $source, int $options = CompileOptions::NO_COMPILE_OPTIONS): Script + public static function compile(Context $context, Source $source, int $options = ScriptCompiler::OPTION_NO_COMPILE_OPTIONS): Script { } diff --git a/tests/001-verify_extension_entities.phpt b/tests/001-verify_extension_entities.phpt index 4930f9f..155e324 100644 --- a/tests/001-verify_extension_entities.phpt +++ b/tests/001-verify_extension_entities.phpt @@ -396,18 +396,16 @@ class V8\ScriptCompiler\Source public function getCachedData(): ?V8\ScriptCompiler\CachedData class V8\ScriptCompiler + const OPTION_NO_COMPILE_OPTIONS = 0 + const OPTION_PRODUCE_PARSER_CACHE = 1 + const OPTION_CONSUME_PARSER_CACHE = 2 + const OPTION_PRODUCE_CODE_CACHE = 3 + const OPTION_CONSUME_CODE_CACHE = 4 public static function cachedDataVersionTag(): int public static function compileUnboundScript(V8\Context $context, V8\ScriptCompiler\Source $source, int $options): V8\UnboundScript public static function compile(V8\Context $context, V8\ScriptCompiler\Source $source, int $options): V8\Script public static function compileFunctionInContext(V8\Context $context, V8\ScriptCompiler\Source $source, array $arguments, array $context_extensions): V8\FunctionObject -final class V8\ScriptCompiler\CompileOptions - const NO_COMPILE_OPTIONS = 0 - const PRODUCE_PARSER_CACHE = 1 - const CONSUME_PARSER_CACHE = 2 - const PRODUCE_CODE_CACHE = 3 - const CONSUME_CODE_CACHE = 4 - class V8\ExceptionManager public static function createRangeError(V8\Context $context, V8\StringValue $message): V8\ObjectValue public static function createReferenceError(V8\Context $context, V8\StringValue $message): V8\ObjectValue diff --git a/tests/002-enums.phpt b/tests/002-enums.phpt index d6efe24..3cd7027 100644 --- a/tests/002-enums.phpt +++ b/tests/002-enums.phpt @@ -19,7 +19,6 @@ $enums = [ new V8\PropertyFilter(), new V8\KeyCollectionMode(), new V8\IndexFilter(), - new V8\ScriptCompiler\CompileOptions(), ]; foreach ($enums as $enum) { @@ -149,19 +148,3 @@ Class constants: ---------------- V8\IndexFilter::INCLUDE_INDICES = 0 V8\IndexFilter::SKIP_INDICES = 1 - - -Object representation: ----------------------- -Class is final: ok -object(V8\ScriptCompiler\CompileOptions)#10 (0) { -} - - -Class constants: ----------------- -V8\ScriptCompiler\CompileOptions::NO_COMPILE_OPTIONS = 0 -V8\ScriptCompiler\CompileOptions::PRODUCE_PARSER_CACHE = 1 -V8\ScriptCompiler\CompileOptions::CONSUME_PARSER_CACHE = 2 -V8\ScriptCompiler\CompileOptions::PRODUCE_CODE_CACHE = 3 -V8\ScriptCompiler\CompileOptions::CONSUME_CODE_CACHE = 4 diff --git a/tests/ScriptCompiler_compile.phpt b/tests/ScriptCompiler_compile.phpt index 38dd53b..e7b182e 100644 --- a/tests/ScriptCompiler_compile.phpt +++ b/tests/ScriptCompiler_compile.phpt @@ -73,7 +73,7 @@ $cache_data = null; $source = new \V8\ScriptCompiler\Source($source_string); $helper->assert('Source cache data is not set', $source->getCachedData() === null); try { - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_PARSER_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_CONSUME_PARSER_CACHE); } catch (\V8\Exceptions\Exception $e) { $helper->exception_export($e); } @@ -84,7 +84,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, '"test " + status'); $source = new \V8\ScriptCompiler\Source($source_string); $helper->assert('Source cache data is NULL', $source->getCachedData() === null); - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::PRODUCE_CODE_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_PRODUCE_CODE_CACHE); $helper->assert('Source cache data is update', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() === false); @@ -97,7 +97,7 @@ $cache_data = null; $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_CODE_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_CONSUME_CODE_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() === false); @@ -109,7 +109,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, '"other " + status'); $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_CODE_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_CONSUME_CODE_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is rejected', $source->getCachedData()->isRejected() === true); @@ -121,7 +121,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, ' "test " + status'); $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_CODE_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_CONSUME_CODE_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() !== false); @@ -133,7 +133,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, '"test " + status'); $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::PRODUCE_CODE_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_PRODUCE_CODE_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is rejected', $source->getCachedData()->isRejected() === true); @@ -146,7 +146,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, '"test " + status'); $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_PARSER_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_CONSUME_PARSER_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() !== true); @@ -159,7 +159,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, '"test " + status'); $source = new \V8\ScriptCompiler\Source($source_string); $helper->assert('Source cache data is NULL', $source->getCachedData() === null); - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::PRODUCE_PARSER_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_PRODUCE_PARSER_CACHE); $helper->assert('Source cache data is NOT updated', $source->getCachedData() === null); $helper->line(); @@ -179,7 +179,7 @@ $parser_cache_src= 'function test(arg1, args) { $source_string = new V8\StringValue($isolate, $parser_cache_src); $source = new \V8\ScriptCompiler\Source($source_string); $helper->assert('Source cache data is NULL', $source->getCachedData() === null); - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::PRODUCE_PARSER_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_PRODUCE_PARSER_CACHE); $helper->assert('Source cache data is update', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() === false); @@ -195,7 +195,7 @@ $parser_cache_src= 'function test(arg1, args) { $source_string = new V8\StringValue($isolate, $parser_cache_src); $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_PARSER_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_CONSUME_PARSER_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() === false); @@ -210,7 +210,7 @@ $parser_cache_src= 'function test(arg1, args) { $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); try { - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_PARSER_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_CONSUME_PARSER_CACHE); } catch (\V8\Exceptions\TryCatchException $e) { $helper->exception_export($e); } @@ -225,7 +225,7 @@ $parser_cache_src= 'function test(arg1, args) { $source_string = new V8\StringValue($isolate, 'function test2() { return 1+1;}'); $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_PARSER_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_CONSUME_PARSER_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is rejected', $source->getCachedData()->isRejected() === true); $helper->assert('Source cache data is not changed', $source->getCachedData()->getData() === $bin); @@ -239,7 +239,7 @@ $parser_cache_src= 'function test(arg1, args) { $source_string = new V8\StringValue($isolate, ' ' . $parser_cache_src); $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_PARSER_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_CONSUME_PARSER_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is rejected', $source->getCachedData()->isRejected() === true); @@ -252,7 +252,7 @@ $parser_cache_src= 'function test(arg1, args) { $source_string = new V8\StringValue($isolate, $parser_cache_src); $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_CODE_CACHE); + $script = V8\ScriptCompiler::compile($context, $source, V8\ScriptCompiler::OPTION_CONSUME_CODE_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() === false); diff --git a/tests/ScriptCompiler_compileUnbound.phpt b/tests/ScriptCompiler_compileUnbound.phpt index 61d1ba8..2738974 100644 --- a/tests/ScriptCompiler_compileUnbound.phpt +++ b/tests/ScriptCompiler_compileUnbound.phpt @@ -81,7 +81,7 @@ $cache_data = null; $source = new \V8\ScriptCompiler\Source($source_string); $helper->assert('Source cache data is not set', $source->getCachedData() === null); try { - $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_PARSER_CACHE); + $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler::OPTION_CONSUME_PARSER_CACHE); } catch (\V8\Exceptions\Exception $e) { $helper->exception_export($e); } @@ -92,7 +92,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, '"test " + status');; $source = new \V8\ScriptCompiler\Source($source_string); $helper->assert('Source cache data is NULL', $source->getCachedData() === null); - $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler\CompileOptions::PRODUCE_CODE_CACHE); + $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler::OPTION_PRODUCE_CODE_CACHE); $helper->assert('Source cache data is update', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() === false); @@ -105,7 +105,7 @@ $cache_data = null; $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_CODE_CACHE); + $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler::OPTION_CONSUME_CODE_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() === false); @@ -117,7 +117,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, '"other " + status');; $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_CODE_CACHE); + $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler::OPTION_CONSUME_CODE_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is rejected', $source->getCachedData()->isRejected() === true); @@ -129,7 +129,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, ' "test " + status');; $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_CODE_CACHE); + $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler::OPTION_CONSUME_CODE_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() !== false); @@ -141,7 +141,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, '"test " + status');; $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler\CompileOptions::PRODUCE_CODE_CACHE); + $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler::OPTION_PRODUCE_CODE_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is rejected', $source->getCachedData()->isRejected() === true); @@ -154,7 +154,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, '"test " + status');; $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_PARSER_CACHE); + $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler::OPTION_CONSUME_PARSER_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() !== true); @@ -167,7 +167,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, '"test " + status');; $source = new \V8\ScriptCompiler\Source($source_string); $helper->assert('Source cache data is NULL', $source->getCachedData() === null); - $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler\CompileOptions::PRODUCE_PARSER_CACHE); + $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler::OPTION_PRODUCE_PARSER_CACHE); $helper->assert('Source cache data is NOT updated', $source->getCachedData() === null); $helper->line(); @@ -179,7 +179,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, 'function test() { return 1+1;}');; $source = new \V8\ScriptCompiler\Source($source_string); $helper->assert('Source cache data is NULL', $source->getCachedData() === null); - $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler\CompileOptions::PRODUCE_PARSER_CACHE); + $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler::OPTION_PRODUCE_PARSER_CACHE); $helper->assert('Source cache data is update', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() === false); @@ -194,7 +194,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, 'function test() { return 1+1;}');; $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_PARSER_CACHE); + $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler::OPTION_CONSUME_PARSER_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() === false); @@ -207,7 +207,7 @@ $cache_data = null; $source_string = new V8\StringValue($isolate, 'function test() { return 1+1;}');; $source = new \V8\ScriptCompiler\Source($source_string, null, $cache_data); $helper->assert('Source cache data is set', $source->getCachedData() != null); - $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler\CompileOptions::CONSUME_CODE_CACHE); + $unbound = V8\ScriptCompiler::compileUnboundScript($context, $source, V8\ScriptCompiler::OPTION_CONSUME_CODE_CACHE); $helper->assert('Source cache data is still set', $source->getCachedData() != null); $helper->assert('Source cache data is not rejected', $source->getCachedData()->isRejected() === false); From 490309332395d139f974ac58e4c818e5fb13e0c3 Mon Sep 17 00:00:00 2001 From: Bogdan Padalko Date: Sat, 16 Sep 2017 15:00:14 +0300 Subject: [PATCH 7/7] Add Isolate::MemoryPressureNotification() support, closes #57 --- src/php_v8_isolate.cc | 60 +++++++++++++++++------- src/php_v8_isolate.h | 6 +++ stubs/src/Isolate.php | 24 ++++++++-- tests/001-verify_extension_entities.phpt | 4 ++ tests/Isolate.phpt | 17 ++++++- 5 files changed, 89 insertions(+), 22 deletions(-) diff --git a/src/php_v8_isolate.cc b/src/php_v8_isolate.cc index d7bc808..eb112d1 100644 --- a/src/php_v8_isolate.cc +++ b/src/php_v8_isolate.cc @@ -296,6 +296,21 @@ static PHP_METHOD(Isolate, isMemoryLimitHit) { RETVAL_BOOL(php_v8_isolate->limits.memory_limit_hit); } +static PHP_METHOD(Isolate, memoryPressureNotification) { + zend_long level = static_cast(v8::MemoryPressureLevel::kNone); + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &level) == FAILURE) { + return; + } + + PHP_V8_CHECK_ISOLATE_MEMORY_PRESSURE_LEVEL(level, "Invalid memory pressure level given. See V8\\Isolate MEMORY_PRESSURE_LEVEL_* class constants for available levels.") + + PHP_V8_ISOLATE_FETCH_WITH_CHECK(getThis(), php_v8_isolate); + PHP_V8_ENTER_ISOLATE(php_v8_isolate); + + isolate->MemoryPressureNotification(static_cast(level)); +} + static PHP_METHOD(Isolate, getHeapStatistics) { if (zend_parse_parameters_none() == FAILURE) { return; @@ -511,6 +526,10 @@ ZEND_END_ARG_INFO() PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_isMemoryLimitHit, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() +PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_memoryPressureNotification, 0) + ZEND_ARG_TYPE_INFO(0, level, IS_LONG, 0) +ZEND_END_ARG_INFO() + PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getHeapStatistics, ZEND_RETURN_VALUE, 0, V8\\HeapStatistics, 0) ZEND_END_ARG_INFO() @@ -555,24 +574,25 @@ ZEND_END_ARG_INFO() static const zend_function_entry php_v8_isolate_methods[] = { - PHP_V8_ME(Isolate, __construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR) - PHP_V8_ME(Isolate, setTimeLimit, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, getTimeLimit, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, isTimeLimitHit, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, setMemoryLimit, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, getMemoryLimit, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, isMemoryLimitHit, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, getHeapStatistics, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, inContext, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, getEnteredContext, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, throwException, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, idleNotificationDeadline, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, lowMemoryNotification, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, terminateExecution, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, isExecutionTerminating, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, cancelTerminateExecution, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, isDead, ZEND_ACC_PUBLIC) - PHP_V8_ME(Isolate, isInUse, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, __construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR) + PHP_V8_ME(Isolate, setTimeLimit, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, getTimeLimit, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, isTimeLimitHit, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, setMemoryLimit, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, getMemoryLimit, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, isMemoryLimitHit, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, memoryPressureNotification, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, getHeapStatistics, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, inContext, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, getEnteredContext, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, throwException, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, idleNotificationDeadline, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, lowMemoryNotification, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, terminateExecution, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, isExecutionTerminating, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, cancelTerminateExecution, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, isDead, ZEND_ACC_PUBLIC) + PHP_V8_ME(Isolate, isInUse, ZEND_ACC_PUBLIC) PHP_V8_ME(Isolate, setCaptureStackTraceForUncaughtExceptions, ZEND_ACC_PUBLIC) PHP_FE_END @@ -586,6 +606,10 @@ PHP_MINIT_FUNCTION (php_v8_isolate) { this_ce = zend_register_internal_class(&ce); this_ce->create_object = php_v8_isolate_ctor; + zend_declare_class_constant_long(this_ce, ZEND_STRL("MEMORY_PRESSURE_LEVEL_NONE"), static_cast(v8::MemoryPressureLevel::kNone)); + zend_declare_class_constant_long(this_ce, ZEND_STRL("MEMORY_PRESSURE_LEVEL_MODERATE"), static_cast(v8::MemoryPressureLevel::kModerate)); + zend_declare_class_constant_long(this_ce, ZEND_STRL("MEMORY_PRESSURE_LEVEL_CRITICAL"), static_cast(v8::MemoryPressureLevel::kCritical)); + memcpy(&php_v8_isolate_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_v8_isolate_object_handlers.offset = XtOffsetOf(php_v8_isolate_t, std); diff --git a/src/php_v8_isolate.h b/src/php_v8_isolate.h index 7af221e..244d864 100644 --- a/src/php_v8_isolate.h +++ b/src/php_v8_isolate.h @@ -115,6 +115,12 @@ inline v8::Local php_v8_isolate_get_key_local(php_v8_isolate_t *php return; \ } \ +#define PHP_V8_CHECK_ISOLATE_MEMORY_PRESSURE_LEVEL(level, message) \ + if (level < static_cast(v8::MemoryPressureLevel::kNone) \ + || level > static_cast(v8::MemoryPressureLevel::kCritical)) { \ + PHP_V8_THROW_VALUE_EXCEPTION(message); \ + return; \ + } struct _php_v8_isolate_t { diff --git a/stubs/src/Isolate.php b/stubs/src/Isolate.php index 2433a38..394cdb2 100644 --- a/stubs/src/Isolate.php +++ b/stubs/src/Isolate.php @@ -21,6 +21,10 @@ class Isolate { + const MEMORY_PRESSURE_LEVEL_NONE = 0; + const MEMORY_PRESSURE_LEVEL_MODERATE = 1; + const MEMORY_PRESSURE_LEVEL_CRITICAL = 2; + public function __construct(StartupData $snapshot = null) { } @@ -49,6 +53,20 @@ public function isTimeLimitHit(): bool { } + /** + * Optional notification that the system is running low on memory. + * V8 uses these notifications to guide heuristics. + * It is allowed to call this function from another thread while + * the isolate is executing long running JavaScript code. + * + * @param int $level + * + * @return void + */ + public function memoryPressureNotification(int $level) + { + } + /** * Get statistics about the heap memory usage. * @@ -82,8 +100,8 @@ public function getEnteredContext(): Context * operation; the caller must return immediately and only after the exception * has been handled does it become legal to invoke JavaScript operations. * - * @param Context $context - * @param Value $value + * @param Context $context + * @param Value $value * @param Throwable|null $e Exception to associate with a given value. * Because how underlying object wiring done, wiring PHP to V8 exceptions * is possible only for V8 exception that are instances of ObjectValue. @@ -195,7 +213,7 @@ public function isInUse(): bool * and report it to the message listeners. The option is off by default. * * @param bool $capture - * @param int $frame_limit + * @param int $frame_limit */ public function setCaptureStackTraceForUncaughtExceptions(bool $capture, int $frame_limit = 10) { diff --git a/tests/001-verify_extension_entities.phpt b/tests/001-verify_extension_entities.phpt index 155e324..ff1e52b 100644 --- a/tests/001-verify_extension_entities.phpt +++ b/tests/001-verify_extension_entities.phpt @@ -327,6 +327,9 @@ class V8\StartupData public static function createFromSource(string $source): V8\StartupData class V8\Isolate + const MEMORY_PRESSURE_LEVEL_NONE = 0 + const MEMORY_PRESSURE_LEVEL_MODERATE = 1 + const MEMORY_PRESSURE_LEVEL_CRITICAL = 2 public function __construct(?V8\StartupData $snapshot) public function setTimeLimit(float $time_limit_in_seconds) public function getTimeLimit(): float @@ -334,6 +337,7 @@ class V8\Isolate public function setMemoryLimit(int $memory_limit_in_bytes) public function getMemoryLimit(): int public function isMemoryLimitHit(): bool + public function memoryPressureNotification(int $level) public function getHeapStatistics(): V8\HeapStatistics public function inContext(): bool public function getEnteredContext(): V8\Context diff --git a/tests/Isolate.phpt b/tests/Isolate.phpt index deef246..f7424bb 100644 --- a/tests/Isolate.phpt +++ b/tests/Isolate.phpt @@ -18,8 +18,17 @@ $helper->header('Object representation'); $helper->dump($isolate); $helper->line(); +$helper->header('Class constants'); +$helper->dump_object_constants($isolate); +$helper->line(); + $helper->method_export($isolate, 'getHeapStatistics'); +$isolate->lowMemoryNotification(); +$isolate->memoryPressureNotification(\V8\Isolate::MEMORY_PRESSURE_LEVEL_NONE); +$isolate->memoryPressureNotification(\V8\Isolate::MEMORY_PRESSURE_LEVEL_MODERATE); +$isolate->memoryPressureNotification(\V8\Isolate::MEMORY_PRESSURE_LEVEL_CRITICAL); + $isolate = null; // EXPECTF: ---/float\(.+\)/ @@ -31,8 +40,14 @@ Object representation: object(V8\Isolate)#2 (0) { } +Class constants: +---------------- +V8\Isolate::MEMORY_PRESSURE_LEVEL_NONE = 0 +V8\Isolate::MEMORY_PRESSURE_LEVEL_MODERATE = 1 +V8\Isolate::MEMORY_PRESSURE_LEVEL_CRITICAL = 2 + V8\Isolate->getHeapStatistics(): - object(V8\HeapStatistics)#26 (9) { + object(V8\HeapStatistics)#27 (9) { ["total_heap_size":"V8\HeapStatistics":private]=> float(%f) ["total_heap_size_executable":"V8\HeapStatistics":private]=>