From 1b39185cf17388a5c36a9203d8e2fcacb5af94dd Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 7 Oct 2020 18:56:33 +0200 Subject: [PATCH 1/3] Update ext/com_dotnet parameter names --- ext/com_dotnet/com_extension.stub.php | 15 +++++++-------- ext/com_dotnet/com_extension_arginfo.h | 24 ++++++++++++------------ ext/com_dotnet/com_persist.stub.php | 4 ++-- ext/com_dotnet/com_persist_arginfo.h | 6 +++--- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/ext/com_dotnet/com_extension.stub.php b/ext/com_dotnet/com_extension.stub.php index 7d451e5baf525..763cc02c1291a 100644 --- a/ext/com_dotnet/com_extension.stub.php +++ b/ext/com_dotnet/com_extension.stub.php @@ -54,32 +54,31 @@ function variant_set_type(variant $variant, int $type): void {} function variant_cast(variant $variant, int $type): variant {} -function com_get_active_object(string $progid, ?int $code_page = null): variant {} +function com_get_active_object(string $prog_id, ?int $code_page = null): variant {} function com_create_guid(): string|false {} -function com_event_sink(variant $comobject, object $sinkobject, array|string|null $sinkinterface = null): bool {} +function com_event_sink(variant $variant, object $sink_object, array|string|null $sink_interface = null): bool {} -/** @param com|dotnet|variant|string $comobject */ -function com_print_typeinfo($comobject, ?string $dispinterface = null, bool $wantsink = false): bool {} +function com_print_typeinfo(variant|string $variant, ?string $disp_interface = null, bool $want_sink = false): bool {} function com_message_pump(int $timeoutms = 0): bool {} -function com_load_typelib(string $typelib_name, bool $case_insensitive = true): bool {} +function com_load_typelib(string $typelib, bool $case_insensitive = true): bool {} class variant { - public function __construct(mixed $value = null, int $type = VT_EMPTY, int $codepage = CP_ACP) {} + public function __construct(mixed $value = null, int $type = VT_EMPTY, int $code_page = CP_ACP) {} } class com { - public function __construct(string $module_name, array|string|null $server_name = null, int $codepage = CP_ACP, string $typelib = "") {} + public function __construct(string $module_name, array|string|null $server_name = null, int $code_page = CP_ACP, string $typelib = "") {} } #if HAVE_MSCOREE_H class dotnet { - public function __construct(string $assembly_name, string $datatype_name, int $codepage = CP_ACP) {} + public function __construct(string $assembly_name, string $datatype_name, int $code_page = CP_ACP) {} } #endif diff --git a/ext/com_dotnet/com_extension_arginfo.h b/ext/com_dotnet/com_extension_arginfo.h index 074cb8575006d..f941527973617 100644 --- a/ext/com_dotnet/com_extension_arginfo.h +++ b/ext/com_dotnet/com_extension_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 637bee9d71fb0d566ce38004eec8bc6f75656837 */ + * Stub hash: 37f8114b24a6ecb8f5eb870274e0fd835bd641e5 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_variant_set, 0, 2, IS_VOID, 0) ZEND_ARG_OBJ_INFO(0, variant, variant, 0) @@ -82,7 +82,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_variant_cast, 0, 2, variant, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_com_get_active_object, 0, 1, variant, 0) - ZEND_ARG_TYPE_INFO(0, progid, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, prog_id, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code_page, IS_LONG, 1, "null") ZEND_END_ARG_INFO() @@ -90,15 +90,15 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_com_create_guid, 0, 0, MAY_BE_ST ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_com_event_sink, 0, 2, _IS_BOOL, 0) - ZEND_ARG_OBJ_INFO(0, comobject, variant, 0) - ZEND_ARG_TYPE_INFO(0, sinkobject, IS_OBJECT, 0) - ZEND_ARG_TYPE_MASK(0, sinkinterface, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null") + ZEND_ARG_OBJ_INFO(0, variant, variant, 0) + ZEND_ARG_TYPE_INFO(0, sink_object, IS_OBJECT, 0) + ZEND_ARG_TYPE_MASK(0, sink_interface, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_com_print_typeinfo, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, comobject) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dispinterface, IS_STRING, 1, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, wantsink, _IS_BOOL, 0, "false") + ZEND_ARG_OBJ_TYPE_MASK(0, variant, variant, MAY_BE_STRING, NULL) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, disp_interface, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, want_sink, _IS_BOOL, 0, "false") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_com_message_pump, 0, 0, _IS_BOOL, 0) @@ -106,20 +106,20 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_com_message_pump, 0, 0, _IS_BOOL ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_com_load_typelib, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, typelib_name, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, typelib, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, case_insensitive, _IS_BOOL, 0, "true") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_variant___construct, 0, 0, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_MIXED, 0, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "VT_EMPTY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, codepage, IS_LONG, 0, "CP_ACP") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code_page, IS_LONG, 0, "CP_ACP") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_com___construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, module_name, IS_STRING, 0) ZEND_ARG_TYPE_MASK(0, server_name, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, codepage, IS_LONG, 0, "CP_ACP") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code_page, IS_LONG, 0, "CP_ACP") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, typelib, IS_STRING, 0, "\"\"") ZEND_END_ARG_INFO() @@ -127,7 +127,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_dotnet___construct, 0, 0, 2) ZEND_ARG_TYPE_INFO(0, assembly_name, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, datatype_name, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, codepage, IS_LONG, 0, "CP_ACP") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code_page, IS_LONG, 0, "CP_ACP") ZEND_END_ARG_INFO() #endif diff --git a/ext/com_dotnet/com_persist.stub.php b/ext/com_dotnet/com_persist.stub.php index 09a842d8fb264..381c086188492 100644 --- a/ext/com_dotnet/com_persist.stub.php +++ b/ext/com_dotnet/com_persist.stub.php @@ -4,13 +4,13 @@ final class COMPersistHelper { - public function __construct(?VARIANT $com_object) {} + public function __construct(?variant $variant) {} public function GetCurFileName(): string|false {} public function SaveToFile(?string $filename, bool $remember = true): bool {} - public function LoadFromFile(string $path, int $flags = 0): bool {} + public function LoadFromFile(string $filename, int $flags = 0): bool {} public function GetMaxStreamSize(): int {} diff --git a/ext/com_dotnet/com_persist_arginfo.h b/ext/com_dotnet/com_persist_arginfo.h index 0665dc343bb02..7c4a964545d67 100644 --- a/ext/com_dotnet/com_persist_arginfo.h +++ b/ext/com_dotnet/com_persist_arginfo.h @@ -1,8 +1,8 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 47d926b2ba30bb3616f4175664723352fff164e7 */ + * Stub hash: d04d007cac328014c6cc76a00cc291237965d56d */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_COMPersistHelper___construct, 0, 0, 1) - ZEND_ARG_OBJ_INFO(0, com_object, VARIANT, 1) + ZEND_ARG_OBJ_INFO(0, variant, variant, 1) ZEND_END_ARG_INFO() 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 ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_COMPersistHelper_LoadFromFile, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0") ZEND_END_ARG_INFO() From 6215cd62b741c2b736e0348a1ac2db56eb69d5fc Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Thu, 8 Oct 2020 09:53:34 +0200 Subject: [PATCH 2/3] Rename some parameters according to PR discussion --- ext/com_dotnet/com_extension.stub.php | 14 +++++++------- ext/com_dotnet/com_extension_arginfo.h | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ext/com_dotnet/com_extension.stub.php b/ext/com_dotnet/com_extension.stub.php index 763cc02c1291a..2505e9c6806ed 100644 --- a/ext/com_dotnet/com_extension.stub.php +++ b/ext/com_dotnet/com_extension.stub.php @@ -42,7 +42,7 @@ function variant_not(mixed $left): variant {} function variant_round(mixed $left, int $decimals): ?variant {} -function variant_cmp(mixed $left, mixed $right, int $lcid = LOCALE_SYSTEM_DEFAULT, int $flags = 0): int {} +function variant_cmp(mixed $left, mixed $right, int $locale_id = LOCALE_SYSTEM_DEFAULT, int $flags = 0): int {} function variant_date_to_timestamp(variant $variant): ?int {} @@ -54,31 +54,31 @@ function variant_set_type(variant $variant, int $type): void {} function variant_cast(variant $variant, int $type): variant {} -function com_get_active_object(string $prog_id, ?int $code_page = null): variant {} +function com_get_active_object(string $prog_id, ?int $codepage = null): variant {} function com_create_guid(): string|false {} function com_event_sink(variant $variant, object $sink_object, array|string|null $sink_interface = null): bool {} -function com_print_typeinfo(variant|string $variant, ?string $disp_interface = null, bool $want_sink = false): bool {} +function com_print_typeinfo(variant|string $variant, ?string $dispatch_interface = null, bool $display_sink = false): bool {} -function com_message_pump(int $timeoutms = 0): bool {} +function com_message_pump(int $timeout_milliseconds = 0): bool {} function com_load_typelib(string $typelib, bool $case_insensitive = true): bool {} class variant { - public function __construct(mixed $value = null, int $type = VT_EMPTY, int $code_page = CP_ACP) {} + public function __construct(mixed $value = null, int $type = VT_EMPTY, int $codepage = CP_ACP) {} } class com { - public function __construct(string $module_name, array|string|null $server_name = null, int $code_page = CP_ACP, string $typelib = "") {} + public function __construct(string $module_name, array|string|null $server_name = null, int $codepage = CP_ACP, string $typelib = "") {} } #if HAVE_MSCOREE_H class dotnet { - public function __construct(string $assembly_name, string $datatype_name, int $code_page = CP_ACP) {} + public function __construct(string $assembly_name, string $datatype_name, int $codepage = CP_ACP) {} } #endif diff --git a/ext/com_dotnet/com_extension_arginfo.h b/ext/com_dotnet/com_extension_arginfo.h index f941527973617..6fb24c8da3754 100644 --- a/ext/com_dotnet/com_extension_arginfo.h +++ b/ext/com_dotnet/com_extension_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 37f8114b24a6ecb8f5eb870274e0fd835bd641e5 */ + * Stub hash: 2c539af9f98b6920f8fd857299ded301ba8cf123 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_variant_set, 0, 2, IS_VOID, 0) ZEND_ARG_OBJ_INFO(0, variant, variant, 0) @@ -55,7 +55,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_variant_cmp, 0, 2, IS_LONG, 0) ZEND_ARG_TYPE_INFO(0, left, IS_MIXED, 0) ZEND_ARG_TYPE_INFO(0, right, IS_MIXED, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, lcid, IS_LONG, 0, "LOCALE_SYSTEM_DEFAULT") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, locale_id, IS_LONG, 0, "LOCALE_SYSTEM_DEFAULT") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0") ZEND_END_ARG_INFO() @@ -83,7 +83,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_com_get_active_object, 0, 1, variant, 0) ZEND_ARG_TYPE_INFO(0, prog_id, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code_page, IS_LONG, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, codepage, IS_LONG, 1, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_com_create_guid, 0, 0, MAY_BE_STRING|MAY_BE_FALSE) @@ -97,12 +97,12 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_com_print_typeinfo, 0, 1, _IS_BOOL, 0) ZEND_ARG_OBJ_TYPE_MASK(0, variant, variant, MAY_BE_STRING, NULL) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, disp_interface, IS_STRING, 1, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, want_sink, _IS_BOOL, 0, "false") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dispatch_interface, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, display_sink, _IS_BOOL, 0, "false") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_com_message_pump, 0, 0, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeoutms, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeout_milliseconds, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_com_load_typelib, 0, 1, _IS_BOOL, 0) @@ -113,13 +113,13 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_variant___construct, 0, 0, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_MIXED, 0, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_LONG, 0, "VT_EMPTY") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code_page, IS_LONG, 0, "CP_ACP") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, codepage, IS_LONG, 0, "CP_ACP") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_com___construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, module_name, IS_STRING, 0) ZEND_ARG_TYPE_MASK(0, server_name, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code_page, IS_LONG, 0, "CP_ACP") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, codepage, IS_LONG, 0, "CP_ACP") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, typelib, IS_STRING, 0, "\"\"") ZEND_END_ARG_INFO() @@ -127,7 +127,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_class_dotnet___construct, 0, 0, 2) ZEND_ARG_TYPE_INFO(0, assembly_name, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, datatype_name, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code_page, IS_LONG, 0, "CP_ACP") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, codepage, IS_LONG, 0, "CP_ACP") ZEND_END_ARG_INFO() #endif From c1e25f8d89e070118c863034e3d5157dffaea4eb Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Thu, 8 Oct 2020 11:04:29 +0200 Subject: [PATCH 3/3] Rename parameter of unary variant functions --- ext/com_dotnet/com_extension.stub.php | 12 ++++++------ ext/com_dotnet/com_extension_arginfo.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/com_dotnet/com_extension.stub.php b/ext/com_dotnet/com_extension.stub.php index 2505e9c6806ed..29c382db33f6a 100644 --- a/ext/com_dotnet/com_extension.stub.php +++ b/ext/com_dotnet/com_extension.stub.php @@ -30,17 +30,17 @@ function variant_pow(mixed $left, mixed $right): variant {} function variant_xor(mixed $left, mixed $right): variant {} -function variant_abs(mixed $left): variant {} +function variant_abs(mixed $value): variant {} -function variant_fix(mixed $left): variant {} +function variant_fix(mixed $value): variant {} -function variant_int(mixed $left): variant {} +function variant_int(mixed $value): variant {} -function variant_neg(mixed $left): variant {} +function variant_neg(mixed $value): variant {} -function variant_not(mixed $left): variant {} +function variant_not(mixed $value): variant {} -function variant_round(mixed $left, int $decimals): ?variant {} +function variant_round(mixed $value, int $decimals): ?variant {} function variant_cmp(mixed $left, mixed $right, int $locale_id = LOCALE_SYSTEM_DEFAULT, int $flags = 0): int {} diff --git a/ext/com_dotnet/com_extension_arginfo.h b/ext/com_dotnet/com_extension_arginfo.h index 6fb24c8da3754..cca7769c34248 100644 --- a/ext/com_dotnet/com_extension_arginfo.h +++ b/ext/com_dotnet/com_extension_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 2c539af9f98b6920f8fd857299ded301ba8cf123 */ + * Stub hash: da1da8fcfe8a04d08d354ad2cc5a3658d16c3076 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_variant_set, 0, 2, IS_VOID, 0) ZEND_ARG_OBJ_INFO(0, variant, variant, 0) @@ -36,7 +36,7 @@ ZEND_END_ARG_INFO() #define arginfo_variant_xor arginfo_variant_add ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_variant_abs, 0, 1, variant, 0) - ZEND_ARG_TYPE_INFO(0, left, IS_MIXED, 0) + ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0) ZEND_END_ARG_INFO() #define arginfo_variant_fix arginfo_variant_abs @@ -48,7 +48,7 @@ ZEND_END_ARG_INFO() #define arginfo_variant_not arginfo_variant_abs ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_variant_round, 0, 2, variant, 1) - ZEND_ARG_TYPE_INFO(0, left, IS_MIXED, 0) + ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0) ZEND_ARG_TYPE_INFO(0, decimals, IS_LONG, 0) ZEND_END_ARG_INFO()