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

Commit 241d0f1

Browse files
pinepainpinepain
committed
Add missed return types hint
1 parent 7828d6f commit 241d0f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+202
-203
lines changed

‎php_v8.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ ZEND_END_MODULE_GLOBALS(v8)
7676
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, NULL, allow_null)
7777
#endif
7878

79+
#define PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(name, required_num_args) ZEND_BEGIN_ARG_INFO_EX(name, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, required_num_args)
80+
#define PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(name, required_num_args) ZEND_BEGIN_ARG_INFO_EX(name, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, required_num_args)
81+
7982
#define PHP_V8_IS_UP_AND_RUNNING() (zend_is_executing() && !CG(unclean_shutdown))
8083

8184
#define PHP_V8_ME(classname, name, flags) PHP_ME(classname, name, arginfo_##name, flags)

‎src/php_v8_array.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static PHP_METHOD(Array, length) {
6060
}
6161

6262

63-
ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
63+
PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 1)
6464
ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
6565
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
6666
ZEND_END_ARG_INFO()

‎src/php_v8_boolean.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static PHP_METHOD(BooleanValue, value) {
5555
}
5656

5757

58-
ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
58+
PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 2)
5959
ZEND_ARG_OBJ_INFO(0, isolate, V8\\Isolate, 0)
6060
ZEND_ARG_TYPE_INFO(0, value, _IS_BOOL, 0)
6161
ZEND_END_ARG_INFO()

‎src/php_v8_boolean_object.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static PHP_METHOD(BooleanObject, valueOf) {
5858
}
5959

6060

61-
ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
61+
PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 2)
6262
ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
6363
ZEND_ARG_TYPE_INFO(0, value, _IS_BOOL, 0)
6464
ZEND_END_ARG_INFO()

‎src/php_v8_cached_data.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static PHP_METHOD(CachedData, isRejected)
106106
}
107107

108108

109-
ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
109+
PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 1)
110110
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
111111
ZEND_END_ARG_INFO()
112112

‎src/php_v8_context.cc

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ static PHP_METHOD(Context, setErrorMessageForCodeGenerationFromStrings)
262262
context->SetErrorMessageForCodeGenerationFromStrings(local_string);
263263
}
264264

265-
ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
265+
PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 1)
266266
ZEND_ARG_OBJ_INFO(0, isolate, V8\\Isolate, 0)
267267
ZEND_ARG_OBJ_INFO(0, global_template, V8\\ObjectTemplate, 1)
268268
ZEND_ARG_OBJ_INFO(0, global_object, V8\\ObjectValue, 1)
@@ -275,32 +275,27 @@ ZEND_END_ARG_INFO()
275275
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_globalObject, ZEND_RETURN_VALUE, 0, V8\\ObjectValue, 0)
276276
ZEND_END_ARG_INFO()
277277

278-
// void method
279-
ZEND_BEGIN_ARG_INFO_EX(arginfo_detachGlobal, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
278+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_detachGlobal, 0)
280279
ZEND_END_ARG_INFO()
281280

282-
// void method
283-
ZEND_BEGIN_ARG_INFO_EX(arginfo_setSecurityToken, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
281+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_setSecurityToken, 1)
284282
ZEND_ARG_OBJ_INFO(0, token, V8\\Value, 0)
285283
ZEND_END_ARG_INFO()
286284

287-
// void method
288-
ZEND_BEGIN_ARG_INFO_EX(arginfo_useDefaultSecurityToken, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
285+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_useDefaultSecurityToken, 0)
289286
ZEND_END_ARG_INFO()
290287

291288
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getSecurityToken, ZEND_RETURN_VALUE, 0, V8\\Value, 0)
292289
ZEND_END_ARG_INFO()
293290

294-
// void method
295-
ZEND_BEGIN_ARG_INFO_EX(arginfo_allowCodeGenerationFromStrings, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
291+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_allowCodeGenerationFromStrings, 1)
296292
ZEND_ARG_TYPE_INFO(0, allow, _IS_BOOL, 0)
297293
ZEND_END_ARG_INFO()
298294

299295
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_isCodeGenerationFromStringsAllowed, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0)
300296
ZEND_END_ARG_INFO()
301297

302-
// void method
303-
ZEND_BEGIN_ARG_INFO_EX(arginfo_setErrorMessageForCodeGenerationFromStrings, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
298+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_setErrorMessageForCodeGenerationFromStrings, 1)
304299
ZEND_ARG_OBJ_INFO(0, message, V8\\StringValue, 0)
305300
ZEND_END_ARG_INFO()
306301

‎src/php_v8_date.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,15 @@ static PHP_METHOD(Date, dateTimeConfigurationChangeNotification) {
7272
}
7373

7474

75-
ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
75+
PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 2)
7676
ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
7777
ZEND_ARG_TYPE_INFO(0, time, IS_DOUBLE, 0)
7878
ZEND_END_ARG_INFO()
7979

8080
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_valueOf, ZEND_RETURN_VALUE, 0, IS_DOUBLE, 0)
8181
ZEND_END_ARG_INFO()
8282

83-
// void method
84-
ZEND_BEGIN_ARG_INFO_EX(arginfo_dateTimeConfigurationChangeNotification, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
83+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_dateTimeConfigurationChangeNotification, 1)
8584
ZEND_ARG_OBJ_INFO(0, isolate, V8\\isolate, 0)
8685
ZEND_END_ARG_INFO()
8786

‎src/php_v8_exceptions.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static PHP_METHOD(ExceptionsTryCatch, getTryCatch)
154154
}
155155

156156

157-
ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 3)
157+
PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 3)
158158
ZEND_ARG_OBJ_INFO(0, isolate, V8\\Isolate, 0)
159159
ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
160160
ZEND_ARG_OBJ_INFO(0, try_catch, V8\\TryCatch, 0)

‎src/php_v8_function.cc

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ static PHP_METHOD(Function, getScriptOrigin) {
574574
}
575575

576576

577-
ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
577+
PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 2)
578578
ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
579579
ZEND_ARG_CALLABLE_INFO(0, callback, 0)
580580
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
@@ -591,8 +591,7 @@ PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_call, ZEND_RETURN_VALUE, 2
591591
ZEND_ARG_ARRAY_INFO(0, arguments, 0)
592592
ZEND_END_ARG_INFO()
593593

594-
// void method
595-
ZEND_BEGIN_ARG_INFO_EX(arginfo_setName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
594+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_setName, 1)
596595
ZEND_ARG_OBJ_INFO(0, name, V8\\StringValue, 0)
597596
ZEND_END_ARG_INFO()
598597

@@ -605,12 +604,10 @@ ZEND_END_ARG_INFO()
605604
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getDisplayName, ZEND_RETURN_VALUE, 0, V8\\Value, 0)
606605
ZEND_END_ARG_INFO()
607606

608-
// long or null
609-
ZEND_BEGIN_ARG_INFO_EX(arginfo_getScriptLineNumber, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
607+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_getScriptLineNumber, ZEND_RETURN_VALUE, 0, IS_LONG, 1)
610608
ZEND_END_ARG_INFO()
611609

612-
// long or null
613-
ZEND_BEGIN_ARG_INFO_EX(arginfo_getScriptColumnNumber, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
610+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_getScriptColumnNumber, ZEND_RETURN_VALUE, 0, IS_LONG, 1)
614611
ZEND_END_ARG_INFO()
615612

616613
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getBoundFunction, ZEND_RETURN_VALUE, 0, V8\\Value, 0)

‎src/php_v8_function_template.cc

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ static PHP_METHOD(FunctionTemplate, getExternalAllocatedMemory) {
450450
}
451451

452452

453-
ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
453+
PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 1)
454454
ZEND_ARG_OBJ_INFO(0, isolate, V8\\Isolate, 0)
455455
ZEND_ARG_CALLABLE_INFO(0, callback, 1)
456456
ZEND_ARG_OBJ_INFO(0, receiver, V8\\FunctionTemplate, 1)
@@ -463,21 +463,21 @@ ZEND_END_ARG_INFO()
463463

464464
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
465465

466-
ZEND_BEGIN_ARG_INFO_EX(arginfo_set, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
466+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_set, 2)
467467
ZEND_ARG_OBJ_INFO(0, name, V8\\NameValue, 0)
468468
ZEND_ARG_OBJ_INFO(0, value, V8\\Data, 0)
469469
ZEND_ARG_TYPE_INFO(0, attributes, IS_LONG, 0)
470470
ZEND_END_ARG_INFO()
471471

472-
ZEND_BEGIN_ARG_INFO_EX(arginfo_setAccessorProperty, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
472+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_setAccessorProperty, 1)
473473
ZEND_ARG_OBJ_INFO(0, name, V8\\NameValue, 0)
474474
ZEND_ARG_OBJ_INFO(0, getter, V8\\FunctionTemplate, 0)
475475
ZEND_ARG_OBJ_INFO(0, setter, V8\\FunctionTemplate, 0)
476476
ZEND_ARG_TYPE_INFO(0, attributes, IS_LONG, 0)
477477
ZEND_ARG_TYPE_INFO(0, settings, IS_LONG, 0)
478478
ZEND_END_ARG_INFO()
479479

480-
ZEND_BEGIN_ARG_INFO_EX(arginfo_setNativeDataProperty, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
480+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_setNativeDataProperty, 2)
481481
ZEND_ARG_OBJ_INFO(0, name, V8\\NameValue, 0)
482482
ZEND_ARG_CALLABLE_INFO(0, getter, 0)
483483
ZEND_ARG_CALLABLE_INFO(0, setter, 1)
@@ -492,48 +492,40 @@ PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getFunction, ZEND_RETURN_V
492492
ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
493493
ZEND_END_ARG_INFO()
494494

495-
// void method
496-
ZEND_BEGIN_ARG_INFO_EX(arginfo_setCallHandler, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
495+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_setCallHandler, 1)
497496
ZEND_ARG_CALLABLE_INFO(0, callback, 0)
498497
ZEND_END_ARG_INFO()
499498

500-
// void method
501-
ZEND_BEGIN_ARG_INFO_EX(arginfo_setLength, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
499+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_setLength, 1)
502500
ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
503501
ZEND_END_ARG_INFO()
504502

505503
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_instanceTemplate, ZEND_RETURN_VALUE, 0, V8\\ObjectTemplate, 0)
506504
ZEND_END_ARG_INFO()
507505

508-
// void method
509-
ZEND_BEGIN_ARG_INFO_EX(arginfo_inherit, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
506+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_inherit, 1)
510507
ZEND_ARG_OBJ_INFO(0, parent, V8\\FunctionTemplate, 0)
511508
ZEND_END_ARG_INFO()
512509

513510
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_prototypeTemplate, ZEND_RETURN_VALUE, 0, V8\\ObjectTemplate, 0)
514511
ZEND_END_ARG_INFO()
515512

516-
// void method
517-
ZEND_BEGIN_ARG_INFO_EX(arginfo_setClassName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
513+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_setClassName, 1)
518514
ZEND_ARG_OBJ_INFO(0, name, V8\\StringValue, 0)
519515
ZEND_END_ARG_INFO()
520516

521-
// void method
522-
ZEND_BEGIN_ARG_INFO_EX(arginfo_setAcceptAnyReceiver, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
517+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_setAcceptAnyReceiver, 1)
523518
ZEND_ARG_TYPE_INFO(0, value, _IS_BOOL, 0)
524519
ZEND_END_ARG_INFO()
525520

526-
// void method
527-
ZEND_BEGIN_ARG_INFO_EX(arginfo_setHiddenPrototype, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
521+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_setHiddenPrototype, 1)
528522
ZEND_ARG_TYPE_INFO(0, value, _IS_BOOL, 0)
529523
ZEND_END_ARG_INFO()
530524

531-
// void method
532-
ZEND_BEGIN_ARG_INFO_EX(arginfo_readOnlyPrototype, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
525+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_readOnlyPrototype, 0)
533526
ZEND_END_ARG_INFO()
534527

535-
// void method
536-
ZEND_BEGIN_ARG_INFO_EX(arginfo_removePrototype, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
528+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_VOID_INFO_EX(arginfo_removePrototype, 0)
537529
ZEND_END_ARG_INFO()
538530

539531
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_hasInstance, ZEND_RETURN_VALUE, 1, _IS_BOOL, 0)

0 commit comments

Comments
 (0)