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

Commit 3c84fe2

Browse files
pinepainpinepain
committed
Rename SymbolValue methods, #41 
1 parent 7f3dc3e commit 3c84fe2

File tree

4 files changed

+84
-84
lines changed

4 files changed

+84
-84
lines changed

‎src/php_v8_symbol.cc

+28-28
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static PHP_METHOD(Symbol, name)
9191
php_v8_get_or_create_value(return_value, local_name, php_v8_value->php_v8_isolate);
9292
}
9393

94-
static PHP_METHOD(Symbol, for)
94+
static PHP_METHOD(Symbol, createFor)
9595
{
9696
zval *php_v8_context_zv;
9797
zval *php_v8_name_zv;
@@ -115,7 +115,7 @@ static PHP_METHOD(Symbol, for)
115115
php_v8_get_or_create_value(return_value, local_symbol, php_v8_context->php_v8_isolate);
116116
}
117117

118-
static PHP_METHOD(Symbol, forApi)
118+
static PHP_METHOD(Symbol, createForApi)
119119
{
120120
zval *php_v8_context_zv;
121121
zval *php_v8_name_zv;
@@ -142,7 +142,7 @@ static PHP_METHOD(Symbol, forApi)
142142
// Well-known symbols
143143

144144
#define PHP_V8_SYMBOL_WELL_KNOWN_METHOD(classname, name) \
145-
PHP_METHOD(classname, get##name) \
145+
PHP_METHOD(classname, get##name##Symbol) \
146146
{ \
147147
zval *php_v8_isolate_zv; \
148148
\
@@ -183,52 +183,52 @@ ZEND_END_ARG_INFO()
183183
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_name, ZEND_RETURN_VALUE, 0, V8\\Value, 0)
184184
ZEND_END_ARG_INFO()
185185

186-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_for, ZEND_RETURN_VALUE, 2, V8\\SymbolValue, 0)
186+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_createFor, ZEND_RETURN_VALUE, 2, V8\\SymbolValue, 0)
187187
ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
188188
ZEND_ARG_OBJ_INFO(0, name, V8\\StringValue, 0)
189189
ZEND_END_ARG_INFO()
190190

191-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_forApi, ZEND_RETURN_VALUE, 2, V8\\SymbolValue, 0)
191+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_createForApi, ZEND_RETURN_VALUE, 2, V8\\SymbolValue, 0)
192192
ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
193193
ZEND_ARG_OBJ_INFO(0, name, V8\\StringValue, 0)
194194
ZEND_END_ARG_INFO()
195195

196196
#define PHP_V8_SYMBOL_WELL_KNOWN_ARGS(name) \
197-
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, ZEND_RETURN_VALUE, 1, V8\\SymbolValue, 0) \
197+
PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_##name##Symbol, ZEND_RETURN_VALUE, 1, V8\\SymbolValue, 0) \
198198
ZEND_ARG_OBJ_INFO(0, isolate, V8\\Isolate, 0) \
199199
ZEND_END_ARG_INFO() \
200200

201201
// Well-known symbols
202-
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(arginfo_getHasInstance);
203-
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(arginfo_getIsConcatSpreadable);
204-
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(arginfo_getIterator);
205-
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(arginfo_getMatch);
206-
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(arginfo_getReplace);
207-
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(arginfo_getSearch);
208-
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(arginfo_getSplit);
209-
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(arginfo_getToPrimitive);
210-
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(arginfo_getToStringTag);
211-
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(arginfo_getUnscopables);
202+
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(getHasInstance);
203+
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(getIsConcatSpreadable);
204+
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(getIterator);
205+
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(getMatch);
206+
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(getReplace);
207+
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(getSearch);
208+
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(getSplit);
209+
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(getToPrimitive);
210+
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(getToStringTag);
211+
PHP_V8_SYMBOL_WELL_KNOWN_ARGS(getUnscopables);
212212

213213

214214
static const zend_function_entry php_v8_symbol_methods[] = {
215215
PHP_V8_ME(Symbol, __construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
216216
PHP_V8_ME(Symbol, value, ZEND_ACC_PUBLIC)
217217
PHP_V8_ME(Symbol, name, ZEND_ACC_PUBLIC)
218-
PHP_V8_ME(Symbol, for, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
219-
PHP_V8_ME(Symbol, forApi, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
218+
PHP_V8_ME(Symbol, createFor, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
219+
PHP_V8_ME(Symbol, createForApi, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
220220

221221
// Well-known symbols
222-
PHP_V8_ME(Symbol, getHasInstance, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
223-
PHP_V8_ME(Symbol, getIsConcatSpreadable, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
224-
PHP_V8_ME(Symbol, getIterator, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
225-
PHP_V8_ME(Symbol, getMatch, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
226-
PHP_V8_ME(Symbol, getReplace, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
227-
PHP_V8_ME(Symbol, getSearch, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
228-
PHP_V8_ME(Symbol, getSplit, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
229-
PHP_V8_ME(Symbol, getToPrimitive, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
230-
PHP_V8_ME(Symbol, getToStringTag, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
231-
PHP_V8_ME(Symbol, getUnscopables, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
222+
PHP_V8_ME(Symbol, getHasInstanceSymbol, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
223+
PHP_V8_ME(Symbol, getIsConcatSpreadableSymbol, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
224+
PHP_V8_ME(Symbol, getIteratorSymbol, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
225+
PHP_V8_ME(Symbol, getMatchSymbol, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
226+
PHP_V8_ME(Symbol, getReplaceSymbol, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
227+
PHP_V8_ME(Symbol, getSearchSymbol, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
228+
PHP_V8_ME(Symbol, getSplitSymbol, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
229+
PHP_V8_ME(Symbol, getToPrimitiveSymbol, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
230+
PHP_V8_ME(Symbol, getToStringTagSymbol, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
231+
PHP_V8_ME(Symbol, getUnscopablesSymbol, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
232232

233233
PHP_FE_END
234234
};

‎stubs/src/SymbolValue.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function name(): Value
6363
*
6464
* @return SymbolValue
6565
*/
66-
public static function for(Context $context, StringValue $name): SymbolValue
66+
public static function createFor(Context $context, StringValue $name): SymbolValue
6767
{
6868
}
6969

@@ -78,7 +78,7 @@ public static function for(Context $context, StringValue $name): SymbolValue
7878
*
7979
* @return SymbolValue
8080
*/
81-
public static function forApi(Context $context, StringValue $name): SymbolValue
81+
public static function createForApi(Context $context, StringValue $name): SymbolValue
8282
{
8383
}
8484

@@ -89,7 +89,7 @@ public static function forApi(Context $context, StringValue $name): SymbolValue
8989
*
9090
* @return SymbolValue
9191
*/
92-
public static function getHasInstance(Isolate $isolate): SymbolValue
92+
public static function getHasInstanceSymbol(Isolate $isolate): SymbolValue
9393
{
9494
}
9595

@@ -98,7 +98,7 @@ public static function getHasInstance(Isolate $isolate): SymbolValue
9898
*
9999
* @return SymbolValue
100100
*/
101-
public static function getIsConcatSpreadable(Isolate $isolate): SymbolValue
101+
public static function getIsConcatSpreadableSymbol(Isolate $isolate): SymbolValue
102102
{
103103
}
104104

@@ -107,7 +107,7 @@ public static function getIsConcatSpreadable(Isolate $isolate): SymbolValue
107107
*
108108
* @return SymbolValue
109109
*/
110-
public static function getIterator(Isolate $isolate): SymbolValue
110+
public static function getIteratorSymbol(Isolate $isolate): SymbolValue
111111
{
112112
}
113113

@@ -116,7 +116,7 @@ public static function getIterator(Isolate $isolate): SymbolValue
116116
*
117117
* @return SymbolValue
118118
*/
119-
public static function getMatch(Isolate $isolate): SymbolValue
119+
public static function getMatchSymbol(Isolate $isolate): SymbolValue
120120
{
121121
}
122122

@@ -125,7 +125,7 @@ public static function getMatch(Isolate $isolate): SymbolValue
125125
*
126126
* @return SymbolValue
127127
*/
128-
public static function getReplace(Isolate $isolate): SymbolValue
128+
public static function getReplaceSymbol(Isolate $isolate): SymbolValue
129129
{
130130
}
131131

@@ -134,7 +134,7 @@ public static function getReplace(Isolate $isolate): SymbolValue
134134
*
135135
* @return SymbolValue
136136
*/
137-
public static function getSearch(Isolate $isolate): SymbolValue
137+
public static function getSearchSymbol(Isolate $isolate): SymbolValue
138138
{
139139
}
140140

@@ -143,7 +143,7 @@ public static function getSearch(Isolate $isolate): SymbolValue
143143
*
144144
* @return SymbolValue
145145
*/
146-
public static function getSplit(Isolate $isolate): SymbolValue
146+
public static function getSplitSymbol(Isolate $isolate): SymbolValue
147147
{
148148
}
149149

@@ -152,7 +152,7 @@ public static function getSplit(Isolate $isolate): SymbolValue
152152
*
153153
* @return SymbolValue
154154
*/
155-
public static function getToPrimitive(Isolate $isolate): SymbolValue
155+
public static function getToPrimitiveSymbol(Isolate $isolate): SymbolValue
156156
{
157157
}
158158

@@ -161,7 +161,7 @@ public static function getToPrimitive(Isolate $isolate): SymbolValue
161161
*
162162
* @return SymbolValue
163163
*/
164-
public static function getToStringTag(Isolate $isolate): SymbolValue
164+
public static function getToStringTagSymbol(Isolate $isolate): SymbolValue
165165
{
166166
}
167167

@@ -170,7 +170,7 @@ public static function getToStringTag(Isolate $isolate): SymbolValue
170170
*
171171
* @return SymbolValue
172172
*/
173-
public static function getUnscopables(Isolate $isolate): SymbolValue
173+
public static function getUnscopablesSymbol(Isolate $isolate): SymbolValue
174174
{
175175
}
176176
}

‎tests/001-verify_extension_entities.phpt

+12-12
Original file line numberDiff line numberDiff line change
@@ -640,18 +640,18 @@ class V8\SymbolValue
640640
public function __construct(V8\Isolate $isolate, ?V8\StringValue $name)
641641
public function value(): string
642642
public function name(): V8\Value
643-
public static function for(V8\Context $context, V8\StringValue $name): V8\SymbolValue
644-
public static function forApi(V8\Context $context, V8\StringValue $name): V8\SymbolValue
645-
public static function getHasInstance(V8\Isolate $isolate): V8\SymbolValue
646-
public static function getIsConcatSpreadable(V8\Isolate $isolate): V8\SymbolValue
647-
public static function getIterator(V8\Isolate $isolate): V8\SymbolValue
648-
public static function getMatch(V8\Isolate $isolate): V8\SymbolValue
649-
public static function getReplace(V8\Isolate $isolate): V8\SymbolValue
650-
public static function getSearch(V8\Isolate $isolate): V8\SymbolValue
651-
public static function getSplit(V8\Isolate $isolate): V8\SymbolValue
652-
public static function getToPrimitive(V8\Isolate $isolate): V8\SymbolValue
653-
public static function getToStringTag(V8\Isolate $isolate): V8\SymbolValue
654-
public static function getUnscopables(V8\Isolate $isolate): V8\SymbolValue
643+
public static function createFor(V8\Context $context, V8\StringValue $name): V8\SymbolValue
644+
public static function createForApi(V8\Context $context, V8\StringValue $name): V8\SymbolValue
645+
public static function getHasInstanceSymbol(V8\Isolate $isolate): V8\SymbolValue
646+
public static function getIsConcatSpreadableSymbol(V8\Isolate $isolate): V8\SymbolValue
647+
public static function getIteratorSymbol(V8\Isolate $isolate): V8\SymbolValue
648+
public static function getMatchSymbol(V8\Isolate $isolate): V8\SymbolValue
649+
public static function getReplaceSymbol(V8\Isolate $isolate): V8\SymbolValue
650+
public static function getSearchSymbol(V8\Isolate $isolate): V8\SymbolValue
651+
public static function getSplitSymbol(V8\Isolate $isolate): V8\SymbolValue
652+
public static function getToPrimitiveSymbol(V8\Isolate $isolate): V8\SymbolValue
653+
public static function getToStringTagSymbol(V8\Isolate $isolate): V8\SymbolValue
654+
public static function getUnscopablesSymbol(V8\Isolate $isolate): V8\SymbolValue
655655

656656
class V8\NumberValue
657657
extends V8\PrimitiveValue

‎tests/SymbolValue.phpt

+32-32
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ $v8_helper->run_checks($res, 'Checkers on Symbol value from script');
123123

124124
function test_For(\V8\Context $context, PhpV8Testsuite $helper)
125125
{
126-
$value = V8\SymbolValue::for($context, new \V8\StringValue($context->getIsolate(), 'test'));
126+
$value = V8\SymbolValue::createFor($context, new \V8\StringValue($context->getIsolate(), 'test'));
127127
$helper->assert('Symbol For(string) returned', $value instanceof \V8\SymbolValue);
128128
$helper->pretty_dump('Symbol For(string) name', $value->name()->value());
129129
$helper->line();
@@ -146,22 +146,22 @@ $v8_helper->CompileRun($context, 'test_For()');
146146

147147

148148
$helper->assert('Isolate not in context', !$isolate->inContext());
149-
$value = V8\SymbolValue::forApi($context, new \V8\StringValue($isolate, 'test'));
149+
$value = V8\SymbolValue::createForApi($context, new \V8\StringValue($isolate, 'test'));
150150
$helper->assert('Symbol ForApi(string) returned', $value instanceof \V8\SymbolValue);
151151
$helper->pretty_dump('Symbol ForApi(string) name', $value->name()->value());
152152
$helper->line();
153153

154154
$static_getters = [
155-
'GetHasInstance',
156-
'GetIsConcatSpreadable',
157-
'GetIterator',
158-
'GetMatch',
159-
'GetReplace',
160-
'GetSearch',
161-
'GetSplit',
162-
'GetToPrimitive',
163-
'GetToStringTag',
164-
'GetUnscopables',
155+
'getHasInstanceSymbol',
156+
'getIsConcatSpreadableSymbol',
157+
'getIteratorSymbol',
158+
'getMatchSymbol',
159+
'getReplaceSymbol',
160+
'getSearchSymbol',
161+
'getSplitSymbol',
162+
'getToPrimitiveSymbol',
163+
'getToStringTagSymbol',
164+
'getUnscopablesSymbol',
165165
];
166166

167167
foreach ($static_getters as $static_getter) {
@@ -607,41 +607,41 @@ Symbol ForApi(string) returned: ok
607607
Symbol ForApi(string) name: string(4) "test"
608608

609609
Isolate not in context: ok
610-
Symbol GetHasInstance() returned: ok
611-
Symbol GetHasInstance() name: string(18) "Symbol.hasInstance"
610+
Symbol getHasInstanceSymbol() returned: ok
611+
Symbol getHasInstanceSymbol() name: string(18) "Symbol.hasInstance"
612612

613613
Isolate not in context: ok
614-
Symbol GetIsConcatSpreadable() returned: ok
615-
Symbol GetIsConcatSpreadable() name: string(25) "Symbol.isConcatSpreadable"
614+
Symbol getIsConcatSpreadableSymbol() returned: ok
615+
Symbol getIsConcatSpreadableSymbol() name: string(25) "Symbol.isConcatSpreadable"
616616

617617
Isolate not in context: ok
618-
Symbol GetIterator() returned: ok
619-
Symbol GetIterator() name: string(15) "Symbol.iterator"
618+
Symbol getIteratorSymbol() returned: ok
619+
Symbol getIteratorSymbol() name: string(15) "Symbol.iterator"
620620

621621
Isolate not in context: ok
622-
Symbol GetMatch() returned: ok
623-
Symbol GetMatch() name: string(12) "Symbol.match"
622+
Symbol getMatchSymbol() returned: ok
623+
Symbol getMatchSymbol() name: string(12) "Symbol.match"
624624

625625
Isolate not in context: ok
626-
Symbol GetReplace() returned: ok
627-
Symbol GetReplace() name: string(14) "Symbol.replace"
626+
Symbol getReplaceSymbol() returned: ok
627+
Symbol getReplaceSymbol() name: string(14) "Symbol.replace"
628628

629629
Isolate not in context: ok
630-
Symbol GetSearch() returned: ok
631-
Symbol GetSearch() name: string(13) "Symbol.search"
630+
Symbol getSearchSymbol() returned: ok
631+
Symbol getSearchSymbol() name: string(13) "Symbol.search"
632632

633633
Isolate not in context: ok
634-
Symbol GetSplit() returned: ok
635-
Symbol GetSplit() name: string(12) "Symbol.split"
634+
Symbol getSplitSymbol() returned: ok
635+
Symbol getSplitSymbol() name: string(12) "Symbol.split"
636636

637637
Isolate not in context: ok
638-
Symbol GetToPrimitive() returned: ok
639-
Symbol GetToPrimitive() name: string(18) "Symbol.toPrimitive"
638+
Symbol getToPrimitiveSymbol() returned: ok
639+
Symbol getToPrimitiveSymbol() name: string(18) "Symbol.toPrimitive"
640640

641641
Isolate not in context: ok
642-
Symbol GetToStringTag() returned: ok
643-
Symbol GetToStringTag() name: string(18) "Symbol.toStringTag"
642+
Symbol getToStringTagSymbol() returned: ok
643+
Symbol getToStringTagSymbol() name: string(18) "Symbol.toStringTag"
644644

645645
Isolate not in context: ok
646-
Symbol GetUnscopables() returned: ok
647-
Symbol GetUnscopables() name: string(18) "Symbol.unscopables"
646+
Symbol getUnscopablesSymbol() returned: ok
647+
Symbol getUnscopablesSymbol() name: string(18) "Symbol.unscopables"

0 commit comments

Comments
 (0)