Add missing argument type information in stubs

kocsismate · kocsismate · commit 73ee69f9d2f0 · 2020-07-02T14:59:59.000+02:00
diff --git a/Zend/tests/bug72162.phpt b/Zend/tests/bug72162.phpt
@@ -7,7 +7,7 @@ $var11 = new StdClass();
 $var16 = error_reporting($var11);
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Object of class stdClass could not be converted to string in %s:%d
+Fatal error: Uncaught TypeError: error_reporting(): Argument #1 ($new_error_level) must be of type ?int, object given in %s:%d
 Stack trace:
 #0 %s(%d): error_reporting(Object(stdClass))
 #1 {main}
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
@@ -385,21 +385,17 @@ ZEND_FUNCTION(strncasecmp)
    Return the current error_reporting level, and if an argument was passed - change to the new level */
 ZEND_FUNCTION(error_reporting)
 {
-	zval *err = NULL;
 	int old_error_reporting;
+	zend_long err;
+	zend_bool err_is_null = 1;
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_ZVAL(err)
+		Z_PARAM_LONG_OR_NULL(err, err_is_null)
 	ZEND_PARSE_PARAMETERS_END();
 
 	old_error_reporting = EG(error_reporting);
-	if (ZEND_NUM_ARGS() != 0) {
-		zend_string *new_val = zval_try_get_string(err);
-		if (UNEXPECTED(!new_val)) {
-			RETURN_THROWS();
-		}
-
+	if (!err_is_null) {
 		do {
 			zend_ini_entry *p = EG(error_reporting_ini_entry);
 
@@ -425,12 +421,8 @@ ZEND_FUNCTION(error_reporting)
 				zend_string_release_ex(p->value, 0);
 			}
 
-			p->value = new_val;
-			if (Z_TYPE_P(err) == IS_LONG) {
-				EG(error_reporting) = Z_LVAL_P(err);
-			} else {
-				EG(error_reporting) = atoi(ZSTR_VAL(p->value));
-			}
+			p->value = zend_long_to_str(err);
+			EG(error_reporting) = err;
 		} while (0);
 	}
 
@@ -686,7 +678,7 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool only_subclass) /*
 	} else if (Z_TYPE_P(obj) == IS_OBJECT) {
 		instance_ce = Z_OBJCE_P(obj);
 	} else {
-		RETURN_FALSE;
+		zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_type_name(obj));
 	}
 
 	if (!only_subclass && EXPECTED(zend_string_equals(instance_ce->name, class_name))) {
diff --git a/Zend/zend_builtin_functions.stub.php b/Zend/zend_builtin_functions.stub.php
@@ -20,8 +20,9 @@ function strcasecmp(string $str1, string $str2): int {}
 
 function strncasecmp(string $str1, string $str2, int $len): int {}
 
-function error_reporting($new_error_level = UNKNOWN): int {}
+function error_reporting(?int $new_error_level = null): int {}
 
+/** @param bool|int|float|string|array|resource|object|null $value */
 function define(string $constant_name, $value, bool $case_insensitive = false): bool {}
 
 function defined(string $constant_name): bool {}
@@ -32,8 +33,10 @@ function get_called_class(): string {}
 
 function get_parent_class(string|object $object = UNKNOWN): string|false {}
 
+/** @param object|string $object */
 function is_subclass_of($object, string $class_name, bool $allow_string = true): bool {}
 
+/** @param object|string $object */
 function is_a($object, string $class_name, bool $allow_string = false): bool {}
 
 function get_class_vars(string $class_name): array|false {}
diff --git a/Zend/zend_builtin_functions_arginfo.h b/Zend/zend_builtin_functions_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: f81f2b4cf552c4ee8406b91c437797feb1164be0 */
+ * Stub hash: df21733ba0df6030d08d234f0ce3c84031f3af88 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_version, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -34,7 +34,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_strncasecmp arginfo_strncmp
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_error_reporting, 0, 0, IS_LONG, 0)
-	ZEND_ARG_INFO(0, new_error_level)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, new_error_level, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_define, 0, 2, _IS_BOOL, 0)
diff --git a/Zend/zend_interfaces.stub.php b/Zend/zend_interfaces.stub.php
@@ -30,17 +30,30 @@ public function rewind();
 
 interface ArrayAccess
 {
-    /** @return bool */
+    /**
+     * @param mixed $offset
+     * @return bool
+     */
     public function offsetExists($offset);
 
-    /* actually this should be return by ref but atm cannot be */
-    /** @return mixed */
+    /**
+     * Actually this should be return by ref but atm cannot be.
+     * @param mixed $offset
+     * @return mixed
+     */
     public function offsetGet($offset);
 
-    /** @return void */
+    /**
+     * @param mixed $offset
+     * @param mixed $value
+     * @return void
+     */
     public function offsetSet($offset, $value);
 
-    /** @return void */
+    /**
+     * @param mixed $offset
+     * @return void
+     */
     public function offsetUnset($offset);
 }
 
diff --git a/Zend/zend_interfaces_arginfo.h b/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: ae9726d113b996346cf906f7d3e8f43efc91a330 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IteratorAggregate_getIterator, 0, 0, 0)
 ZEND_END_ARG_INFO()
diff --git a/ext/hash/hash.stub.php b/ext/hash/hash.stub.php
@@ -31,8 +31,8 @@ function hash_hmac_algos(): array {}
 function hash_pbkdf2(string $algo, string $password, string $salt, int $iterations, int $length = 0, bool $raw_output = false): string {}
 
 /**
- * @param $known_string no type juggling is performed
- * @param $user_string no type juggling is performed
+ * @param string $known_string no type juggling is performed
+ * @param string $user_string no type juggling is performed
  */
 function hash_equals(string $known_string, string $user_string): bool {}
 
diff --git a/ext/hash/hash_arginfo.h b/ext/hash/hash_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: d4caa0bf70c25a8436049197e822a6c85e4e4643 */
+ * Stub hash: 074ac4c7d8bf3fd068456fe0e7577de57dbe0487 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_hash, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, algo, IS_STRING, 0)
diff --git a/ext/intl/php_intl.stub.php b/ext/intl/php_intl.stub.php
@@ -366,6 +366,7 @@ function intltz_create_time_zone_id_enumeration(int $zoneType, ?string $region =
 
 function intltz_from_date_time_zone(DateTimeZone $zone): ?IntlTimeZone {}
 
+/** @param bool $isSystemID */
 function intltz_get_canonical_id(string $zoneId, &$isSystemID = null): string|false {}
 
 function intltz_get_display_name(IntlTimeZone $tz, bool $isDaylight = false, int $style = IntlTimeZone::DISPLAY_LONG, ?string $locale = null): string|false {}
@@ -414,7 +415,7 @@ function transliterator_list_ids(): array|false {}
 
 function transliterator_create_inverse(Transliterator $orig_trans): ?Transliterator {}
 
-/** @param Transliterator|string */
+/** @param Transliterator|string $transliterator */
 function transliterator_transliterate($transliterator, string $subject, int $start = 0, int $end = -1): string|false {}
 
 function transliterator_get_error_code(Transliterator $trans): int|false {}
diff --git a/ext/intl/php_intl_arginfo.h b/ext/intl/php_intl_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: f5411cdc67ac288183c4210932b222c406bfe254 */
+ * Stub hash: 290db397461f797572c1cac7c2278df87099476c */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_intlcal_create_instance, 0, 0, IntlCalendar, 1)
 	ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, timeZone, "null")
diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php
@@ -681,7 +681,7 @@ function mysqli_stmt_attr_set(mysqli_stmt $mysql_stmt, int $attr, int $mode_in):
 
 function mysqli_stmt_bind_param(mysqli_stmt $mysql_stmt, string $types, mixed &...$vars): bool {}
 
-/** @param mixed &...$vars */
+/** @param mixed $vars */
 function mysqli_stmt_bind_result(mysqli_stmt $mysql_stmt, &...$vars): bool {}
 
 function mysqli_stmt_close(mysqli_stmt $mysql_stmt): bool {}
diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 49567a0e831c0a484aaf2c2d213ad24109f2639b */
+ * Stub hash: fd71a49c5e3723ec697661bac3e03882d5dbedbb */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
 	ZEND_ARG_OBJ_INFO(0, mysql_link, mysqli, 0)
diff --git a/ext/reflection/php_reflection.stub.php b/ext/reflection/php_reflection.stub.php
@@ -485,9 +485,7 @@ class ReflectionParameter implements Reflector
     /** @alias ReflectionClass::__clone */
     final private function __clone() {}
 
-    /**
-     * @param $function string|array|object
-     */
+    /** @param string|array|object $function */
     public function __construct($function, int|string $parameter) {}
 
     public function __toString(): string {}
diff --git a/ext/reflection/php_reflection_arginfo.h b/ext/reflection/php_reflection_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 2facddef786be36211215451083b610a5d09dec7 */
+ * Stub hash: 61daf9fa79b5c189de354a0be889ee021de0d6a5 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Reflection_getModifierNames, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, modifiers, IS_LONG, 0)
