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

Commit d488fa8

Browse files
pinepainpinepain
authored
Merge pull request #32 from pinepain/refactor-to-psr
Refactor methods name to follow PSR-2 camelCase convention
2 parents 440a867 + 943710a commit d488fa8

File tree

229 files changed

+6267
-6239
lines changed

Some content is hidden

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

229 files changed

+6267
-6239
lines changed

‎README.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ make any assumptions for you, so you stay in control, it does exactly what you a
3434

3535
With php-v8 you can even implement nodejs in PHP. Not sure whether anyone should/will do this anyway, but it's doable.
3636

37-
*NOTE: Most, if not all, methods are named like in the V8 API - starting from capital letter. This PSR violation is done
38-
intentionally with the purpose to provide a more solid experience between the native V8 C++ API and the V8 PHP API.*
39-
40-
4137
## Demo
4238

4339
Here is a [Hello World][v8-hello-world]
@@ -50,9 +46,9 @@ $context = new \V8\Context($isolate);
5046
$source = new \V8\StringValue($isolate, "'Hello' + ', World!'");
5147

5248
$script = new \V8\Script($context, $source);
53-
$result = $script->Run($context);
49+
$result = $script->run($context);
5450

55-
echo $result->ToString($context)->Value(), PHP_EOL;
51+
echo $result->toString($context)->value(), PHP_EOL;
5652
```
5753

5854
which will output `Hello, World!`. See how it's shorter and more readable than [that C++ version][v8-hello-world]?

‎php_v8.h

+3
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ ZEND_END_MODULE_GLOBALS(v8)
7777

7878
#define PHP_V8_IS_UP_AND_RUNNING() (zend_is_executing() && !CG(unclean_shutdown))
7979

80+
#define PHP_V8_ME(classname, name, flags) PHP_ME(classname, name, arginfo_##name, flags)
81+
#define PHP_V8_ABSTRACT_ME(classname, name) PHP_ABSTRACT_ME(classname, name, arginfo_##name)
82+
8083
/* Always refer to the globals in your function as PHP_V8_G(variable).
8184
You are encouraged to rename these macros something shorter, see
8285
examples in any other php module directory.

‎src/php_v8_array.cc

+6-7
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ zend_class_entry *php_v8_array_class_entry;
2525
#define this_ce php_v8_array_class_entry
2626

2727

28-
static PHP_METHOD(V8Array, __construct) {
28+
static PHP_METHOD(Array, __construct) {
2929
zval rv;
3030
zval *php_v8_context_zv;
3131

@@ -48,7 +48,7 @@ static PHP_METHOD(V8Array, __construct) {
4848
php_v8_value->persistent->Reset(isolate, local_array);
4949
}
5050

51-
static PHP_METHOD(V8Array, Length) {
51+
static PHP_METHOD(Array, length) {
5252
if (zend_parse_parameters_none() == FAILURE) {
5353
return;
5454
}
@@ -60,19 +60,18 @@ static PHP_METHOD(V8Array, Length) {
6060
}
6161

6262

63-
ZEND_BEGIN_ARG_INFO_EX(arginfo_v8_array___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
63+
ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 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()
6767

68-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_array_Length, ZEND_RETURN_VALUE, 0, IS_LONG, 0)
68+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_length, ZEND_RETURN_VALUE, 0, IS_LONG, 0)
6969
ZEND_END_ARG_INFO()
7070

7171

7272
static const zend_function_entry php_v8_array_methods[] = {
73-
PHP_ME(V8Array, __construct, arginfo_v8_array___construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
74-
75-
PHP_ME(V8Array, Length, arginfo_v8_array_Length, ZEND_ACC_PUBLIC)
73+
PHP_V8_ME(Array, __construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
74+
PHP_V8_ME(Array, length, ZEND_ACC_PUBLIC)
7675

7776
PHP_FE_END
7877
};

‎src/php_v8_boolean.cc

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ zend_class_entry *php_v8_boolean_class_entry;
2323
#define this_ce php_v8_boolean_class_entry
2424

2525

26-
static PHP_METHOD(V8BooleanValue, __construct) {
26+
static PHP_METHOD(BooleanValue, __construct) {
2727
zval *php_v8_isolate_zv;
2828

2929
zend_bool value = '\0';
@@ -41,7 +41,7 @@ static PHP_METHOD(V8BooleanValue, __construct) {
4141
php_v8_value->persistent->Reset(isolate, local_value);
4242
}
4343

44-
static PHP_METHOD(V8BooleanValue, Value) {
44+
static PHP_METHOD(BooleanValue, value) {
4545
if (zend_parse_parameters_none() == FAILURE) {
4646
return;
4747
}
@@ -55,18 +55,18 @@ static PHP_METHOD(V8BooleanValue, Value) {
5555
}
5656

5757

58-
ZEND_BEGIN_ARG_INFO_EX(arginfo_v8_boolean___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
58+
ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 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()
6262

63-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_boolean_Value, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0)
63+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_value, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0)
6464
ZEND_END_ARG_INFO()
6565

6666

6767
static const zend_function_entry php_v8_boolean_methods[] = {
68-
PHP_ME(V8BooleanValue, __construct, arginfo_v8_boolean___construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
69-
PHP_ME(V8BooleanValue, Value, arginfo_v8_boolean_Value, ZEND_ACC_PUBLIC)
68+
PHP_V8_ME(BooleanValue, __construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
69+
PHP_V8_ME(BooleanValue, value, ZEND_ACC_PUBLIC)
7070
PHP_FE_END
7171
};
7272

‎src/php_v8_boolean_object.cc

+6-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ zend_class_entry *php_v8_boolean_object_class_entry;
2424
#define this_ce php_v8_boolean_object_class_entry
2525

2626

27-
static PHP_METHOD(V8BooleanObject, __construct) {
27+
static PHP_METHOD(BooleanObject, __construct) {
2828
zval rv;
2929
zval *php_v8_context_zv;
3030

@@ -44,7 +44,7 @@ static PHP_METHOD(V8BooleanObject, __construct) {
4444
}
4545

4646

47-
static PHP_METHOD(V8BooleanObject, ValueOf) {
47+
static PHP_METHOD(BooleanObject, valueOf) {
4848
if (zend_parse_parameters_none() == FAILURE) {
4949
return;
5050
}
@@ -58,19 +58,18 @@ static PHP_METHOD(V8BooleanObject, ValueOf) {
5858
}
5959

6060

61-
ZEND_BEGIN_ARG_INFO_EX(arginfo_v8_boolean_object___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
61+
ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 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()
6565

66-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_boolean_object_ValueOf, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0)
66+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_valueOf, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0)
6767
ZEND_END_ARG_INFO()
6868

6969

7070
static const zend_function_entry php_v8_boolean_object_methods[] = {
71-
PHP_ME(V8BooleanObject, __construct, arginfo_v8_boolean_object___construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
72-
73-
PHP_ME(V8BooleanObject, ValueOf, arginfo_v8_boolean_object_ValueOf, ZEND_ACC_PUBLIC)
71+
PHP_V8_ME(BooleanObject, __construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
72+
PHP_V8_ME(BooleanObject, valueOf, ZEND_ACC_PUBLIC)
7473

7574
PHP_FE_END
7675
};

‎src/php_v8_cached_data.cc

+9-9
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ static zend_object * php_v8_cached_data_ctor(zend_class_entry *ce)
6464
return &php_v8_cached_data->std;
6565
}
6666

67-
static PHP_METHOD(V8CachedData, __construct)
67+
static PHP_METHOD(CachedData, __construct)
6868
{
6969
zend_string *string = NULL;
7070

@@ -83,7 +83,7 @@ static PHP_METHOD(V8CachedData, __construct)
8383
php_v8_cached_data->cached_data = new v8::ScriptCompiler::CachedData(data, length, v8::ScriptCompiler::CachedData::BufferPolicy::BufferOwned);
8484
}
8585

86-
static PHP_METHOD(V8CachedData, GetData)
86+
static PHP_METHOD(CachedData, getData)
8787
{
8888
if (zend_parse_parameters_none() == FAILURE) {
8989
return;
@@ -94,7 +94,7 @@ static PHP_METHOD(V8CachedData, GetData)
9494
RETVAL_STRINGL(reinterpret_cast<const char*>(php_v8_cached_data->cached_data->data), php_v8_cached_data->cached_data->length);
9595
}
9696

97-
static PHP_METHOD(V8CachedData, IsRejected)
97+
static PHP_METHOD(CachedData, isRejected)
9898
{
9999
if (zend_parse_parameters_none() == FAILURE) {
100100
return;
@@ -106,21 +106,21 @@ static PHP_METHOD(V8CachedData, IsRejected)
106106
}
107107

108108

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

113-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_cached_data_GetData, ZEND_RETURN_VALUE, 0, IS_STRING, 0)
113+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_getData, ZEND_RETURN_VALUE, 0, IS_STRING, 0)
114114
ZEND_END_ARG_INFO()
115115

116-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_cached_data_IsRejected, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0)
116+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_isRejected, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0)
117117
ZEND_END_ARG_INFO()
118118

119119

120120
static const zend_function_entry php_v8_cached_data_methods[] = {
121-
PHP_ME(V8CachedData, __construct, arginfo_v8_cached_data___construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
122-
PHP_ME(V8CachedData, GetData, arginfo_v8_cached_data_GetData, ZEND_ACC_PUBLIC)
123-
PHP_ME(V8CachedData, IsRejected, arginfo_v8_cached_data_IsRejected, ZEND_ACC_PUBLIC)
121+
PHP_V8_ME(CachedData, __construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
122+
PHP_V8_ME(CachedData, getData, ZEND_ACC_PUBLIC)
123+
PHP_V8_ME(CachedData, isRejected, ZEND_ACC_PUBLIC)
124124

125125
PHP_FE_END
126126
};

‎src/php_v8_callback_info.cc

+15-15
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ zend_class_entry *php_v8_callback_info_class_entry;
2626
static zend_object_handlers php_v8_callback_info_object_handlers;
2727

2828

29-
static PHP_METHOD(V8CallbackInfo, GetIsolate) {
29+
static PHP_METHOD(CallbackInfo, getIsolate) {
3030
zval rv;
3131
zval *tmp;
3232

@@ -38,7 +38,7 @@ static PHP_METHOD(V8CallbackInfo, GetIsolate) {
3838
ZVAL_COPY(return_value, tmp);
3939
}
4040

41-
static PHP_METHOD(V8CallbackInfo, GetContext) {
41+
static PHP_METHOD(CallbackInfo, getContext) {
4242
zval rv;
4343
zval *tmp;
4444

@@ -50,7 +50,7 @@ static PHP_METHOD(V8CallbackInfo, GetContext) {
5050
ZVAL_COPY(return_value, tmp);
5151
}
5252

53-
static PHP_METHOD(V8CallbackInfo, This) {
53+
static PHP_METHOD(CallbackInfo, this) {
5454
zval rv;
5555
zval *tmp;
5656

@@ -62,7 +62,7 @@ static PHP_METHOD(V8CallbackInfo, This) {
6262
ZVAL_COPY(return_value, tmp);
6363
}
6464

65-
static PHP_METHOD(V8CallbackInfo, Holder) {
65+
static PHP_METHOD(CallbackInfo, holder) {
6666
zval rv;
6767
zval *tmp;
6868

@@ -74,7 +74,7 @@ static PHP_METHOD(V8CallbackInfo, Holder) {
7474
ZVAL_COPY(return_value, tmp);
7575
}
7676

77-
static PHP_METHOD(V8CallbackInfo, GetReturnValue) {
77+
static PHP_METHOD(CallbackInfo, getReturnValue) {
7878
zval rv;
7979
zval *tmp;
8080

@@ -86,27 +86,27 @@ static PHP_METHOD(V8CallbackInfo, GetReturnValue) {
8686
ZVAL_COPY(return_value, tmp);
8787
}
8888

89-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_callback_info_GetIsolate, ZEND_RETURN_VALUE, 0, V8\\Isolate, 0)
89+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getIsolate, ZEND_RETURN_VALUE, 0, V8\\Isolate, 0)
9090
ZEND_END_ARG_INFO()
9191

92-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_callback_info_GetContext, ZEND_RETURN_VALUE, 0, V8\\Context, 0)
92+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getContext, ZEND_RETURN_VALUE, 0, V8\\Context, 0)
9393
ZEND_END_ARG_INFO()
9494

95-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_callback_info_This, ZEND_RETURN_VALUE, 0, V8\\ObjectValue, 0)
95+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_this, ZEND_RETURN_VALUE, 0, V8\\ObjectValue, 0)
9696
ZEND_END_ARG_INFO()
9797

98-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_callback_info_Holder, ZEND_RETURN_VALUE, 0, V8\\ObjectValue, 0)
98+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_holder, ZEND_RETURN_VALUE, 0, V8\\ObjectValue, 0)
9999
ZEND_END_ARG_INFO()
100100

101-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_callback_info_GetReturnValue, ZEND_RETURN_VALUE, 0, V8\\ReturnValue, 0)
101+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getReturnValue, ZEND_RETURN_VALUE, 0, V8\\ReturnValue, 0)
102102
ZEND_END_ARG_INFO()
103103

104104
static const zend_function_entry php_v8_callback_info_methods[] = {
105-
PHP_ME(V8CallbackInfo, This, arginfo_v8_callback_info_This, ZEND_ACC_PUBLIC)
106-
PHP_ME(V8CallbackInfo, Holder, arginfo_v8_callback_info_Holder, ZEND_ACC_PUBLIC)
107-
PHP_ME(V8CallbackInfo, GetIsolate, arginfo_v8_callback_info_GetIsolate, ZEND_ACC_PUBLIC)
108-
PHP_ME(V8CallbackInfo, GetContext, arginfo_v8_callback_info_GetContext, ZEND_ACC_PUBLIC)
109-
PHP_ME(V8CallbackInfo, GetReturnValue, arginfo_v8_callback_info_GetReturnValue, ZEND_ACC_PUBLIC)
105+
PHP_V8_ME(CallbackInfo, this, ZEND_ACC_PUBLIC)
106+
PHP_V8_ME(CallbackInfo, holder, ZEND_ACC_PUBLIC)
107+
PHP_V8_ME(CallbackInfo, getIsolate, ZEND_ACC_PUBLIC)
108+
PHP_V8_ME(CallbackInfo, getContext, ZEND_ACC_PUBLIC)
109+
PHP_V8_ME(CallbackInfo, getReturnValue, ZEND_ACC_PUBLIC)
110110
PHP_FE_END
111111
};
112112

0 commit comments

Comments
 (0)