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

Commit 22d62c8

Browse files
pinepainpinepain
committed
Add V8\ObjectValue::SetNativeDataProperty() method
1 parent 7bf2bda commit 22d62c8

12 files changed

+380
-32
lines changed

‎src/php_v8_object.cc‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,85 @@ static PHP_METHOD(V8Object, SetAccessorProperty) {
530530
local_object->SetAccessorProperty(local_name, getter, setter, static_cast<v8::PropertyAttribute>(attributes), static_cast<v8::AccessControl>(settings));
531531
}
532532

533+
534+
///**
535+
// * Sets a native data property like Template::SetNativeDataProperty, but
536+
// * this method sets on this object directly.
537+
// */
538+
//V8_WARN_UNUSED_RESULT Maybe<bool> SetNativeDataProperty(
539+
// Local<Context> context, Local<Name> name,
540+
// AccessorNameGetterCallback getter,
541+
// AccessorNameSetterCallback setter = nullptr,
542+
// Local<Value> data = Local<Value>(), PropertyAttribute attributes = None);
543+
544+
static PHP_METHOD(V8Object, SetNativeDataProperty) {
545+
zval *context_zv;
546+
zval *php_v8_name_zv;
547+
548+
zend_long attributes = 0;
549+
550+
zend_fcall_info getter_fci = empty_fcall_info;
551+
zend_fcall_info_cache getter_fci_cache = empty_fcall_info_cache;
552+
553+
zend_fcall_info setter_fci = empty_fcall_info;
554+
zend_fcall_info_cache setter_fci_cache = empty_fcall_info_cache;
555+
556+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "oof|f!l",
557+
&context_zv,
558+
&php_v8_name_zv,
559+
&getter_fci, &getter_fci_cache,
560+
&setter_fci, &setter_fci_cache,
561+
&attributes
562+
) == FAILURE) {
563+
return;
564+
}
565+
566+
PHP_V8_VALUE_FETCH_WITH_CHECK(getThis(), php_v8_value);
567+
PHP_V8_VALUE_FETCH_WITH_CHECK(php_v8_name_zv, php_v8_name);
568+
PHP_V8_CONTEXT_FETCH_WITH_CHECK(context_zv, php_v8_context);
569+
570+
PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_context)
571+
PHP_V8_DATA_ISOLATES_CHECK(php_v8_value, php_v8_name)
572+
573+
PHP_V8_ENTER_STORED_ISOLATE(php_v8_context);
574+
PHP_V8_ENTER_CONTEXT(php_v8_context);
575+
576+
v8::Local<v8::Object> local_object = php_v8_value_get_local_as<v8::Object>(php_v8_value);
577+
v8::Local<v8::Name> local_name = php_v8_value_get_local_as<v8::Name>(php_v8_name);
578+
579+
PHP_V8_CONVERT_FROM_V8_STRING_TO_STRING(name, local_name);
580+
581+
attributes = attributes ? attributes & PHP_V8_PROPERTY_ATTRIBUTE_FLAGS : attributes;
582+
583+
v8::AccessorNameGetterCallback getter;
584+
v8::AccessorNameSetterCallback setter = 0;
585+
v8::Local<v8::External> data;
586+
587+
phpv8::CallbacksBucket *bucket = php_v8_value->persistent_data->bucket("native_data_property_", local_name->IsSymbol(), name);
588+
data = v8::External::New(isolate, bucket);
589+
590+
bucket->add(0, getter_fci, getter_fci_cache);
591+
getter = php_v8_callback_accessor_name_getter;
592+
593+
if (setter_fci.size) {
594+
bucket->add(1, setter_fci, setter_fci_cache);
595+
setter = php_v8_callback_accessor_name_setter;
596+
}
597+
598+
v8::Maybe<bool> maybe_res = local_object->SetNativeDataProperty(context,
599+
local_name,
600+
getter,
601+
setter,
602+
data,
603+
static_cast<v8::PropertyAttribute>(attributes)
604+
);
605+
606+
PHP_V8_THROW_EXCEPTION_WHEN_NOTHING(maybe_res, "Failed to set native data property");
607+
608+
RETURN_BOOL(maybe_res.FromJust());
609+
}
610+
611+
533612
/* NOTE: we skip functionality for private properties for now */
534613

535614
static PHP_METHOD(V8Object, GetPropertyNames) {
@@ -1270,6 +1349,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_php_v8_object_SetAccessorProperty, ZEND_SEND_BY_V
12701349
ZEND_ARG_TYPE_INFO(0, settings, IS_LONG, 0)
12711350
ZEND_END_ARG_INFO()
12721351

1352+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_php_v8_object_SetNativeDataProperty, ZEND_RETURN_VALUE, 3, _IS_BOOL, 0)
1353+
ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
1354+
ZEND_ARG_OBJ_INFO(0, name, V8\\NameValue, 0)
1355+
ZEND_ARG_CALLABLE_INFO(0, getter, 0)
1356+
ZEND_ARG_CALLABLE_INFO(0, setter, 1)
1357+
ZEND_ARG_TYPE_INFO(0, attributes, IS_LONG, 0)
1358+
ZEND_END_ARG_INFO()
1359+
12731360
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_php_v8_object_GetPropertyNames, ZEND_RETURN_VALUE, 1, V8\\ArrayObject, 0)
12741361
ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
12751362
ZEND_END_ARG_INFO()
@@ -1395,6 +1482,7 @@ static const zend_function_entry php_v8_object_methods[] = {
13951482
PHP_ME(V8Object, Delete, arginfo_v8_object_Delete, ZEND_ACC_PUBLIC)
13961483
PHP_ME(V8Object, SetAccessor, arginfo_v8_object_SetAccessor, ZEND_ACC_PUBLIC)
13971484
PHP_ME(V8Object, SetAccessorProperty, arginfo_php_v8_object_SetAccessorProperty, ZEND_ACC_PUBLIC)
1485+
PHP_ME(V8Object, SetNativeDataProperty, arginfo_php_v8_object_SetNativeDataProperty, ZEND_ACC_PUBLIC)
13981486
PHP_ME(V8Object, GetPropertyNames, arginfo_php_v8_object_GetPropertyNames, ZEND_ACC_PUBLIC)
13991487
PHP_ME(V8Object, GetOwnPropertyNames, arginfo_php_v8_object_GetOwnPropertyNames, ZEND_ACC_PUBLIC)
14001488
PHP_ME(V8Object, GetPrototype, arginfo_php_v8_object_GetPrototype, ZEND_ACC_PUBLIC)

‎stubs/src/ObjectValue.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,27 @@ public function SetAccessorProperty(
174174
) {
175175
}
176176

177+
/**
178+
* Sets a native data property like Template::SetNativeDataProperty, but
179+
* this method sets on this object directly.
180+
*
181+
* @param Context $context
182+
* @param NameValue $name
183+
* @param callable $getter
184+
* @param callable $setter
185+
* @param int $attributes
186+
*
187+
* @return bool
188+
*/
189+
public function SetNativeDataProperty(
190+
Context $context,
191+
NameValue $name,
192+
callable $getter,
193+
callable $setter = null,
194+
int $attributes = PropertyAttribute::None
195+
): bool {
196+
}
197+
177198
/**
178199
* Returns an array containing the names of the enumerable properties
179200
* of this object, including properties from prototype objects. The

‎tests/V8ArrayObject.phpt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ V8\ArrayObject(V8\Value)->IsProxy(): bool(false)
166166
Converters:
167167
-----------
168168
V8\ArrayObject(V8\Value)->ToBoolean():
169-
object(V8\BooleanValue)#118 (1) {
169+
object(V8\BooleanValue)#119 (1) {
170170
["isolate":"V8\Value":private]=>
171171
object(V8\Isolate)#3 (5) {
172172
["snapshot":"V8\Isolate":private]=>
@@ -182,7 +182,7 @@ V8\ArrayObject(V8\Value)->ToBoolean():
182182
}
183183
}
184184
V8\ArrayObject(V8\Value)->ToNumber():
185-
object(V8\Int32Value)#118 (1) {
185+
object(V8\Int32Value)#119 (1) {
186186
["isolate":"V8\Value":private]=>
187187
object(V8\Isolate)#3 (5) {
188188
["snapshot":"V8\Isolate":private]=>
@@ -198,7 +198,7 @@ V8\ArrayObject(V8\Value)->ToNumber():
198198
}
199199
}
200200
V8\ArrayObject(V8\Value)->ToString():
201-
object(V8\StringValue)#118 (1) {
201+
object(V8\StringValue)#119 (1) {
202202
["isolate":"V8\Value":private]=>
203203
object(V8\Isolate)#3 (5) {
204204
["snapshot":"V8\Isolate":private]=>
@@ -214,7 +214,7 @@ V8\ArrayObject(V8\Value)->ToString():
214214
}
215215
}
216216
V8\ArrayObject(V8\Value)->ToDetailString():
217-
object(V8\StringValue)#118 (1) {
217+
object(V8\StringValue)#119 (1) {
218218
["isolate":"V8\Value":private]=>
219219
object(V8\Isolate)#3 (5) {
220220
["snapshot":"V8\Isolate":private]=>
@@ -262,7 +262,7 @@ V8\ArrayObject(V8\Value)->ToObject():
262262
}
263263
}
264264
V8\ArrayObject(V8\Value)->ToInteger():
265-
object(V8\Int32Value)#118 (1) {
265+
object(V8\Int32Value)#119 (1) {
266266
["isolate":"V8\Value":private]=>
267267
object(V8\Isolate)#3 (5) {
268268
["snapshot":"V8\Isolate":private]=>
@@ -278,7 +278,7 @@ V8\ArrayObject(V8\Value)->ToInteger():
278278
}
279279
}
280280
V8\ArrayObject(V8\Value)->ToUint32():
281-
object(V8\Int32Value)#118 (1) {
281+
object(V8\Int32Value)#119 (1) {
282282
["isolate":"V8\Value":private]=>
283283
object(V8\Isolate)#3 (5) {
284284
["snapshot":"V8\Isolate":private]=>
@@ -294,7 +294,7 @@ V8\ArrayObject(V8\Value)->ToUint32():
294294
}
295295
}
296296
V8\ArrayObject(V8\Value)->ToInt32():
297-
object(V8\Int32Value)#118 (1) {
297+
object(V8\Int32Value)#119 (1) {
298298
["isolate":"V8\Value":private]=>
299299
object(V8\Isolate)#3 (5) {
300300
["snapshot":"V8\Isolate":private]=>

‎tests/V8FunctionObject.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,15 +154,15 @@ Should output Hello World string
154154
string(11) "Script done"
155155

156156
v8Tests\TrackingDtors\FunctionObject(V8\FunctionObject)->GetScriptOrigin():
157-
object(V8\ScriptOrigin)#127 (6) {
157+
object(V8\ScriptOrigin)#128 (6) {
158158
["resource_name":"V8\ScriptOrigin":private]=>
159159
string(0) ""
160160
["resource_line_offset":"V8\ScriptOrigin":private]=>
161161
int(0)
162162
["resource_column_offset":"V8\ScriptOrigin":private]=>
163163
int(0)
164164
["options":"V8\ScriptOrigin":private]=>
165-
object(V8\ScriptOriginOptions)#131 (4) {
165+
object(V8\ScriptOriginOptions)#132 (4) {
166166
["is_shared_cross_origin":"V8\ScriptOriginOptions":private]=>
167167
bool(false)
168168
["is_opaque":"V8\ScriptOriginOptions":private]=>

‎tests/V8MapObject.phpt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ V8\MapObject(V8\Value)->IsProxy(): bool(false)
208208
Converters:
209209
-----------
210210
V8\MapObject(V8\Value)->ToBoolean():
211-
object(V8\BooleanValue)#119 (1) {
211+
object(V8\BooleanValue)#120 (1) {
212212
["isolate":"V8\Value":private]=>
213213
object(V8\Isolate)#3 (5) {
214214
["snapshot":"V8\Isolate":private]=>
@@ -224,7 +224,7 @@ V8\MapObject(V8\Value)->ToBoolean():
224224
}
225225
}
226226
V8\MapObject(V8\Value)->ToNumber():
227-
object(V8\NumberValue)#119 (1) {
227+
object(V8\NumberValue)#120 (1) {
228228
["isolate":"V8\Value":private]=>
229229
object(V8\Isolate)#3 (5) {
230230
["snapshot":"V8\Isolate":private]=>
@@ -240,7 +240,7 @@ V8\MapObject(V8\Value)->ToNumber():
240240
}
241241
}
242242
V8\MapObject(V8\Value)->ToString():
243-
object(V8\StringValue)#119 (1) {
243+
object(V8\StringValue)#120 (1) {
244244
["isolate":"V8\Value":private]=>
245245
object(V8\Isolate)#3 (5) {
246246
["snapshot":"V8\Isolate":private]=>
@@ -256,7 +256,7 @@ V8\MapObject(V8\Value)->ToString():
256256
}
257257
}
258258
V8\MapObject(V8\Value)->ToDetailString():
259-
object(V8\StringValue)#119 (1) {
259+
object(V8\StringValue)#120 (1) {
260260
["isolate":"V8\Value":private]=>
261261
object(V8\Isolate)#3 (5) {
262262
["snapshot":"V8\Isolate":private]=>
@@ -304,7 +304,7 @@ V8\MapObject(V8\Value)->ToObject():
304304
}
305305
}
306306
V8\MapObject(V8\Value)->ToInteger():
307-
object(V8\Int32Value)#119 (1) {
307+
object(V8\Int32Value)#120 (1) {
308308
["isolate":"V8\Value":private]=>
309309
object(V8\Isolate)#3 (5) {
310310
["snapshot":"V8\Isolate":private]=>
@@ -320,7 +320,7 @@ V8\MapObject(V8\Value)->ToInteger():
320320
}
321321
}
322322
V8\MapObject(V8\Value)->ToUint32():
323-
object(V8\Int32Value)#119 (1) {
323+
object(V8\Int32Value)#120 (1) {
324324
["isolate":"V8\Value":private]=>
325325
object(V8\Isolate)#3 (5) {
326326
["snapshot":"V8\Isolate":private]=>
@@ -336,7 +336,7 @@ V8\MapObject(V8\Value)->ToUint32():
336336
}
337337
}
338338
V8\MapObject(V8\Value)->ToInt32():
339-
object(V8\Int32Value)#119 (1) {
339+
object(V8\Int32Value)#120 (1) {
340340
["isolate":"V8\Value":private]=>
341341
object(V8\Isolate)#3 (5) {
342342
["snapshot":"V8\Isolate":private]=>

‎tests/V8ObjectTemplate_SetNativeDataProperty.phpt‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
--TEST--
2+
V8\ObjectTemplate::SetNativeDataProperty
3+
--SKIPIF--
4+
<?php if (!extension_loaded("v8")) {
5+
print "skip";
6+
} ?>
7+
--FILE--
8+
<?php
9+
10+
// TODO: check object with callbacks persistance!
11+
12+
/** @var \Phpv8Testsuite $helper */
13+
$helper = require '.testsuite.php';
14+
require '.v8-helpers.php';
15+
$v8_helper = new PhpV8Helpers($helper);
16+
17+
$isolate1 = new \V8\Isolate();
18+
19+
$prop_value = 'foo';
20+
21+
$getter = function (\V8\NameValue $property, \V8\PropertyCallbackInfo $info) use (&$prop_value) {
22+
echo 'Userland native getter on property ', $property->ToString($info->GetContext())->Value(), ' called, value is ', $prop_value, PHP_EOL;
23+
24+
$info->GetReturnValue()->Set(new \V8\StringValue($info->GetIsolate(), $prop_value));
25+
};
26+
27+
$setter = function (\V8\NameValue $property, \V8\Value $value, \V8\PropertyCallbackInfo $info) use (& $prop_value) {
28+
$val = $value->ToString($info->GetContext())->Value();
29+
echo 'Userland native setter on property ', $property->ToString($info->GetContext())->Value(), ' called with ', $val, ', value is ', $prop_value, PHP_EOL;
30+
31+
$prop_value = $val;
32+
};
33+
34+
$tpl = new V8\ObjectTemplate($isolate1);
35+
$tpl->SetNativeDataProperty(new \V8\StringValue($isolate1, 'test'), $getter, $setter);
36+
37+
38+
$context1 = new V8\Context($isolate1);
39+
$context1->GlobalObject()->Set($context1, new \V8\StringValue($isolate1, 'obj'), $tpl->NewInstance($context1));
40+
41+
$v8_helper->injectConsoleLog($context1);
42+
43+
$source1 = '
44+
console.log(obj.test, "\n");
45+
obj.test = "bar";
46+
console.log(obj.test, "\n");
47+
48+
"Script done";
49+
';
50+
$file_name1 = 'test.js';
51+
52+
53+
$script1 = new V8\Script($context1, new \V8\StringValue($isolate1, $source1), new \V8\ScriptOrigin($file_name1));
54+
55+
$v8_helper->CompileRun($context1, $source1);
56+
57+
?>
58+
--EXPECT--
59+
Userland native getter on property test called, value is foo
60+
foo
61+
62+
Userland native setter on property test called with bar, value is foo
63+
Userland native getter on property test called, value is bar
64+
bar

0 commit comments

Comments
 (0)