Skip to content

Commit 561b581

Browse files
cmb69cmb69
committed
Update ext/com_dotnet parameter names
Closes GH-6296.
1 parent 5480e6b commit 561b581

File tree

4 files changed

+31
-32
lines changed

4 files changed

+31
-32
lines changed

‎ext/com_dotnet/com_extension.stub.php

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ function variant_pow(mixed $left, mixed $right): variant {}
3030

3131
function variant_xor(mixed $left, mixed $right): variant {}
3232

33-
function variant_abs(mixed $left): variant {}
33+
function variant_abs(mixed $value): variant {}
3434

35-
function variant_fix(mixed $left): variant {}
35+
function variant_fix(mixed $value): variant {}
3636

37-
function variant_int(mixed $left): variant {}
37+
function variant_int(mixed $value): variant {}
3838

39-
function variant_neg(mixed $left): variant {}
39+
function variant_neg(mixed $value): variant {}
4040

41-
function variant_not(mixed $left): variant {}
41+
function variant_not(mixed $value): variant {}
4242

43-
function variant_round(mixed $left, int $decimals): ?variant {}
43+
function variant_round(mixed $value, int $decimals): ?variant {}
4444

45-
function variant_cmp(mixed $left, mixed $right, int $lcid = LOCALE_SYSTEM_DEFAULT, int $flags = 0): int {}
45+
function variant_cmp(mixed $left, mixed $right, int $locale_id = LOCALE_SYSTEM_DEFAULT, int $flags = 0): int {}
4646

4747
function variant_date_to_timestamp(variant $variant): ?int {}
4848

@@ -54,18 +54,17 @@ function variant_set_type(variant $variant, int $type): void {}
5454

5555
function variant_cast(variant $variant, int $type): variant {}
5656

57-
function com_get_active_object(string $progid, ?int $code_page = null): variant {}
57+
function com_get_active_object(string $prog_id, ?int $codepage = null): variant {}
5858

5959
function com_create_guid(): string|false {}
6060

61-
function com_event_sink(variant $comobject, object $sinkobject, array|string|null $sinkinterface = null): bool {}
61+
function com_event_sink(variant $variant, object $sink_object, array|string|null $sink_interface = null): bool {}
6262

63-
/** @param com|dotnet|variant|string $comobject */
64-
function com_print_typeinfo($comobject, ?string $dispinterface = null, bool $wantsink = false): bool {}
63+
function com_print_typeinfo(variant|string $variant, ?string $dispatch_interface = null, bool $display_sink = false): bool {}
6564

66-
function com_message_pump(int $timeoutms = 0): bool {}
65+
function com_message_pump(int $timeout_milliseconds = 0): bool {}
6766

68-
function com_load_typelib(string $typelib_name, bool $case_insensitive = true): bool {}
67+
function com_load_typelib(string $typelib, bool $case_insensitive = true): bool {}
6968

7069
class variant
7170
{

‎ext/com_dotnet/com_extension_arginfo.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 637bee9d71fb0d566ce38004eec8bc6f75656837 */
2+
* Stub hash: da1da8fcfe8a04d08d354ad2cc5a3658d16c3076 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_variant_set, 0, 2, IS_VOID, 0)
55
ZEND_ARG_OBJ_INFO(0, variant, variant, 0)
@@ -36,7 +36,7 @@ ZEND_END_ARG_INFO()
3636
#define arginfo_variant_xor arginfo_variant_add
3737

3838
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_variant_abs, 0, 1, variant, 0)
39-
ZEND_ARG_TYPE_INFO(0, left, IS_MIXED, 0)
39+
ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
4040
ZEND_END_ARG_INFO()
4141

4242
#define arginfo_variant_fix arginfo_variant_abs
@@ -48,14 +48,14 @@ ZEND_END_ARG_INFO()
4848
#define arginfo_variant_not arginfo_variant_abs
4949

5050
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_variant_round, 0, 2, variant, 1)
51-
ZEND_ARG_TYPE_INFO(0, left, IS_MIXED, 0)
51+
ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
5252
ZEND_ARG_TYPE_INFO(0, decimals, IS_LONG, 0)
5353
ZEND_END_ARG_INFO()
5454

5555
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_variant_cmp, 0, 2, IS_LONG, 0)
5656
ZEND_ARG_TYPE_INFO(0, left, IS_MIXED, 0)
5757
ZEND_ARG_TYPE_INFO(0, right, IS_MIXED, 0)
58-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, lcid, IS_LONG, 0, "LOCALE_SYSTEM_DEFAULT")
58+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale_id, IS_LONG, 0, "LOCALE_SYSTEM_DEFAULT")
5959
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
6060
ZEND_END_ARG_INFO()
6161

@@ -82,31 +82,31 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_variant_cast, 0, 2, variant, 0)
8282
ZEND_END_ARG_INFO()
8383

8484
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_com_get_active_object, 0, 1, variant, 0)
85-
ZEND_ARG_TYPE_INFO(0, progid, IS_STRING, 0)
86-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code_page, IS_LONG, 1, "null")
85+
ZEND_ARG_TYPE_INFO(0, prog_id, IS_STRING, 0)
86+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, codepage, IS_LONG, 1, "null")
8787
ZEND_END_ARG_INFO()
8888

8989
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_com_create_guid, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
9090
ZEND_END_ARG_INFO()
9191

9292
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_com_event_sink, 0, 2, _IS_BOOL, 0)
93-
ZEND_ARG_OBJ_INFO(0, comobject, variant, 0)
94-
ZEND_ARG_TYPE_INFO(0, sinkobject, IS_OBJECT, 0)
95-
ZEND_ARG_TYPE_MASK(0, sinkinterface, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null")
93+
ZEND_ARG_OBJ_INFO(0, variant, variant, 0)
94+
ZEND_ARG_TYPE_INFO(0, sink_object, IS_OBJECT, 0)
95+
ZEND_ARG_TYPE_MASK(0, sink_interface, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null")
9696
ZEND_END_ARG_INFO()
9797

9898
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_com_print_typeinfo, 0, 1, _IS_BOOL, 0)
99-
ZEND_ARG_INFO(0, comobject)
100-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dispinterface, IS_STRING, 1, "null")
101-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, wantsink, _IS_BOOL, 0, "false")
99+
ZEND_ARG_OBJ_TYPE_MASK(0, variant, variant, MAY_BE_STRING, NULL)
100+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dispatch_interface, IS_STRING, 1, "null")
101+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, display_sink, _IS_BOOL, 0, "false")
102102
ZEND_END_ARG_INFO()
103103

104104
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_com_message_pump, 0, 0, _IS_BOOL, 0)
105-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeoutms, IS_LONG, 0, "0")
105+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeout_milliseconds, IS_LONG, 0, "0")
106106
ZEND_END_ARG_INFO()
107107

108108
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_com_load_typelib, 0, 1, _IS_BOOL, 0)
109-
ZEND_ARG_TYPE_INFO(0, typelib_name, IS_STRING, 0)
109+
ZEND_ARG_TYPE_INFO(0, typelib, IS_STRING, 0)
110110
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, case_insensitive, _IS_BOOL, 0, "true")
111111
ZEND_END_ARG_INFO()
112112

‎ext/com_dotnet/com_persist.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
final class COMPersistHelper
66
{
7-
public function __construct(?VARIANT $com_object) {}
7+
public function __construct(?variant $variant) {}
88

99
public function GetCurFileName(): string|false {}
1010

1111
public function SaveToFile(?string $filename, bool $remember = true): bool {}
1212

13-
public function LoadFromFile(string $path, int $flags = 0): bool {}
13+
public function LoadFromFile(string $filename, int $flags = 0): bool {}
1414

1515
public function GetMaxStreamSize(): int {}
1616

‎ext/com_dotnet/com_persist_arginfo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 47d926b2ba30bb3616f4175664723352fff164e7 */
2+
* Stub hash: d04d007cac328014c6cc76a00cc291237965d56d */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_COMPersistHelper___construct, 0, 0, 1)
5-
ZEND_ARG_OBJ_INFO(0, com_object, VARIANT, 1)
5+
ZEND_ARG_OBJ_INFO(0, variant, variant, 1)
66
ZEND_END_ARG_INFO()
77

88
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_COMPersistHelper_GetCurFileName, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
@@ -14,7 +14,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_COMPersistHelper_SaveToFil
1414
ZEND_END_ARG_INFO()
1515

1616
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_COMPersistHelper_LoadFromFile, 0, 1, _IS_BOOL, 0)
17-
ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0)
17+
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
1818
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
1919
ZEND_END_ARG_INFO()
2020

0 commit comments

Comments
 (0)