Add a few missing parameter types in stubs

Related to GH-5627

Author: kocsismate

Zend/tests/argument_restriction_005.phpt

@@ -8,4 +8,4 @@ class Sub implements ArrayAccess {
 }
 ?>
 --EXPECTF--
-Fatal error: Declaration of Sub::offsetSet() must be compatible with ArrayAccess::offsetSet($offset, $value) in %sargument_restriction_005.php on line %d
+Fatal error: Declaration of Sub::offsetSet() must be compatible with ArrayAccess::offsetSet(mixed $offset, mixed $value) in %sargument_restriction_005.php on line %d

Zend/zend_builtin_functions.stub.php

@@ -23,7 +23,7 @@ function strncasecmp(string $string1, string $string2, int $length): int {}
 function error_reporting(?int $error_level = null): int {}
 
 /** @param mixed $value */
-function define(string $constant_name, $value, $case_insensitive = false): bool {}
+function define(string $constant_name, $value, bool $case_insensitive = false): bool {}
 
 function defined(string $constant_name): bool {}
 

Zend/zend_builtin_functions_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: d1ab4864c1159916b45c8f272a2a1d708b2dca65 */
+ * Stub hash: 1f644f72600eddbbb01a4c3912a2c9c5fe12188e */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_version, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -40,7 +40,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_define, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, constant_name, IS_STRING, 0)
 	ZEND_ARG_INFO(0, value)
-	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, case_insensitive, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, case_insensitive, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_defined, 0, 1, _IS_BOOL, 0)

Zend/zend_closures.stub.php

@@ -17,6 +17,6 @@ public function bindTo(?object $newThis, $newScope = UNKNOWN): ?Closure {}
 
     public function call(object $newThis, mixed ...$arguments): mixed {}
 
-    /** @param callable $callback Not a proper type annotation due to bug #78770 */
+    /** @param callable $callback callable is not a proper type due to bug #78770. */
     public static function fromCallable($callback): Closure {}
 }

Zend/zend_closures_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 57771cb65a3193bd683be75efd04f7daff0f8585 */
+ * Stub hash: 62198e96940fe0e86fe89601015c837aa5390e92 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Closure___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()

Zend/zend_interfaces.stub.php

@@ -31,17 +31,19 @@ public function rewind();
 interface ArrayAccess
 {
     /** @return bool */
-    public function offsetExists($offset);
+    public function offsetExists(mixed $offset);
 
-    /* actually this should be return by ref but atm cannot be */
-    /** @return mixed */
-    public function offsetGet($offset);
+    /**
+     * Actually this should be return by ref but atm cannot be.
+     * @return mixed
+     */
+    public function offsetGet(mixed $offset);
 
     /** @return void */
-    public function offsetSet($offset, $value);
+    public function offsetSet(mixed $offset, mixed $value);
 
     /** @return void */
-    public function offsetUnset($offset);
+    public function offsetUnset(mixed $offset);
 }
 
 interface Serializable

Zend/zend_interfaces_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: c3b97b8a9c7522fc5b58e63fbf9cd6a801f4bbc2 */
+ * Stub hash: 1aa9ef81a738328a334176d37683646b60b2f6fa */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IteratorAggregate_getIterator, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -15,14 +15,14 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_Iterator_rewind arginfo_class_IteratorAggregate_getIterator
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayAccess_offsetExists, 0, 0, 1)
-	ZEND_ARG_INFO(0, offset)
+	ZEND_ARG_TYPE_INFO(0, offset, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_ArrayAccess_offsetGet arginfo_class_ArrayAccess_offsetExists
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ArrayAccess_offsetSet, 0, 0, 2)
-	ZEND_ARG_INFO(0, offset)
-	ZEND_ARG_INFO(0, value)
+	ZEND_ARG_TYPE_INFO(0, offset, IS_MIXED, 0)
+	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_ArrayAccess_offsetUnset arginfo_class_ArrayAccess_offsetExists

ext/com_dotnet/com_com.c

@@ -288,18 +288,23 @@ PHP_FUNCTION(com_get_active_object)
 	CLSID clsid;
 	char *module_name;
 	size_t module_name_len;
-	zend_long code_page = COMG(code_page);
+	zend_long code_page;
+	zend_bool code_page_is_null = 1;
 	IUnknown *unk = NULL;
 	IDispatch *obj = NULL;
 	HRESULT res;
 	OLECHAR *module = NULL;
 
 	php_com_initialize();
-	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|l",
-				&module_name, &module_name_len, &code_page)) {
+	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "s|l!",
+				&module_name, &module_name_len, &code_page, &code_page_is_null)) {
 		RETURN_THROWS();
 	}
 
+	if (code_page_is_null) {
+		code_page = COMG(code_page);
+	}
+
 	module = php_com_string_to_olestring(module_name, module_name_len, (int)code_page);
 
 	res = CLSIDFromString(module, &clsid);

ext/com_dotnet/com_extension.c

@@ -259,6 +259,7 @@ PHP_MINIT_FUNCTION(com_dotnet)
 	COM_CONST(VARCMP_EQ);
 	COM_CONST(VARCMP_GT);
 	COM_CONST(VARCMP_NULL);
+	COM_CONST(LOCALE_SYSTEM_DEFAULT);
 
 	COM_CONST(NORM_IGNORECASE);
 	COM_CONST(NORM_IGNORENONSPACE);

ext/com_dotnet/com_extension.stub.php

@@ -2,63 +2,63 @@
 
 /** @generate-function-entries */
 
-function variant_set(variant $variant, $value): void {}
+function variant_set(variant $variant, mixed $value): void {}
 
-function variant_add($left, $right): variant {}
+function variant_add(mixed $left, mixed $right): variant {}
 
-function variant_cat($left, $right): variant {}
+function variant_cat(mixed $left, mixed $right): variant {}
 
-function variant_sub($left, $right): variant {}
+function variant_sub(mixed $left, mixed $right): variant {}
 
-function variant_mul($left, $right): variant {}
+function variant_mul(mixed $left, mixed $right): variant {}
 
-function variant_and($left, $right): variant {}
+function variant_and(mixed $left, mixed $right): variant {}
 
-function variant_div($left, $right): variant {}
+function variant_div(mixed $left, mixed $right): variant {}
 
-function variant_eqv($left, $right): variant {}
+function variant_eqv(mixed $left, mixed $right): variant {}
 
-function variant_idiv($left, $right): variant {}
+function variant_idiv(mixed $left, mixed $right): variant {}
 
-function variant_imp($left, $right): variant {}
+function variant_imp(mixed $left, mixed $right): variant {}
 
-function variant_mod($left, $right): variant {}
+function variant_mod(mixed $left, mixed $right): variant {}
 
-function variant_or($left, $right): variant {}
+function variant_or(mixed $left, mixed $right): variant {}
 
-function variant_pow($left, $right): variant {}
+function variant_pow(mixed $left, mixed $right): variant {}
 
-function variant_xor($left, $right): variant {}
+function variant_xor(mixed $left, mixed $right): variant {}
 
-function variant_abs($left): variant {}
+function variant_abs(mixed $left): variant {}
 
-function variant_fix($left): variant {}
+function variant_fix(mixed $left): variant {}
 
-function variant_int($left): variant {}
+function variant_int(mixed $left): variant {}
 
-function variant_neg($left): variant {}
+function variant_neg(mixed $left): variant {}
 
-function variant_not($left): variant {}
+function variant_not(mixed $left): variant {}
 
-function variant_round($left, int $decimals): ?variant {}
+function variant_round(mixed $left, int $decimals): ?variant {}
 
-function variant_cmp($left, $right, int $lcid = UNKNOWN, int $flags = 0): int {}
+function variant_cmp(mixed $left, mixed $right, int $lcid = LOCALE_SYSTEM_DEFAULT, int $flags = 0): int {}
 
 function variant_date_to_timestamp(variant $variant): ?int {}
 
-/** @return variant|false */
-function variant_date_from_timestamp(int $timestamp) {}
+function variant_date_from_timestamp(int $timestamp): variant|false {}
 
 function variant_get_type(variant $variant): int {}
 
 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 = UNKNOWN): variant {}
+function com_get_active_object(string $progid, ?int $code_page = null): variant {}
 
 function com_create_guid(): string|false {}
 
+/** @param array|string|null $sinkinterface */
 function com_event_sink(variant $comobject, object $sinkobject, $sinkinterface = UNKNOWN): bool {}
 
 function com_print_typeinfo($comobject, ?string $dispinterface = null, bool $wantsink = false): bool {}
@@ -69,7 +69,7 @@ function com_load_typelib(string $typelib_name, bool $case_insensitive = true):
 
 class variant
 {
-    public function __construct($value = null, int $type = VT_EMPTY, int $codepage = CP_ACP) {}
+    public function __construct(mixed $value = null, int $type = VT_EMPTY, int $codepage = CP_ACP) {}
 }
 
 class com