Fix arginfos

Author: kocsismate

ext/intl/normalizer/normalizer.stub.php

@@ -8,15 +8,17 @@ public static function normalize(string $input, int $form = Normalizer::FORM_C)
     /** @return bool */
     public static function isNormalized(string $input, int $form = Normalizer::FORM_C) {}
 
+#if U_ICU_VERSION_MAJOR_NUM >= 56
     /** @return string|null */
     public static function getRawDecomposition(string $input, int $form = Normalizer::FORM_C) {}
+#endif
 }
 
 /** @return string|false */
 function normalizer_normalize(string $input, int $form = Normalizer::FORM_C) {}
 
-/** @return bool */
-function normalizer_is_normalized(string $input, int $form = Normalizer::FORM_C) {}
+function normalizer_is_normalized(string $input, int $form = Normalizer::FORM_C): bool {}
 
-/** @return string|null */
-function normalizer_get_raw_decomposition(string $input, int $form = Normalizer::FORM_C) {}
+#if U_ICU_VERSION_MAJOR_NUM >= 56
+function normalizer_get_raw_decomposition(string $input, int $form = Normalizer::FORM_C): ?string {}
+#endif

ext/intl/normalizer/normalizer_arginfo.h

@@ -7,10 +7,23 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_Normalizer_isNormalized arginfo_class_Normalizer_normalize
 
-#define arginfo_class_Normalizer_getRawDecomposition arginfo_class_Normalizer_normalize
+#if U_ICU_VERSION_MAJOR_NUM >= 56
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Normalizer_getRawDecomposition, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, form, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+#endif
 
 #define arginfo_normalizer_normalize arginfo_class_Normalizer_normalize
 
-#define arginfo_normalizer_is_normalized arginfo_class_Normalizer_normalize
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_normalizer_is_normalized, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, form, IS_LONG, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_normalizer_get_raw_decomposition arginfo_class_Normalizer_normalize
+#if U_ICU_VERSION_MAJOR_NUM >= 56
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_normalizer_get_raw_decomposition, 0, 1, IS_STRING, 1)
+	ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, form, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+#endif

ext/intl/normalizer/normalizer_class.c

@@ -26,21 +26,6 @@ zend_class_entry *Normalizer_ce_ptr = NULL;
  * 'Normalizer' class registration structures & functions
  */
 
-/* {{{ Normalizer methods arguments info */
-
-ZEND_BEGIN_ARG_INFO_EX( normalizer_args, 0, 0, 1 )
-	ZEND_ARG_INFO( 0, input )
-	ZEND_ARG_INFO( 0, form )
-ZEND_END_ARG_INFO()
-
-#if U_ICU_VERSION_MAJOR_NUM >= 56
-ZEND_BEGIN_ARG_INFO_EX( decomposition_args, 0, 0, 1 )
-	ZEND_ARG_INFO( 0, input )
-ZEND_END_ARG_INFO();
-#endif
-
-/* }}} */
-
 /* {{{ Normalizer_class_functions
  * Every 'Normalizer' class method has an entry in this table
  */

ext/intl/resourcebundle/resourcebundle.stub.php

@@ -13,7 +13,7 @@ public static function create(?string $locale, ?string $bundlename, bool $fallba
      */
     public function get($index, bool $fallback = true) {}
 
-    /** @return int */
+    /** @return int|false */
     public function count() {}
 
     /** @return array|false */
@@ -31,18 +31,16 @@ function resourcebundle_create(?string $locale, ?string $bundlename, bool $fallb
 
 /**
  * @param string|int $index
- * @return ResourceBundle|false|null
+ * @return mixed
  */
 function resourcebundle_get(ResourceBundle $bundle, $index) {}
 
-/** @return int */
+/** @return int|false */
 function resourcebundle_count(ResourceBundle $bundle) {}
 
 /** @return array|false */
 function resourcebundle_locales(string $bundlename) {}
 
-/** @return int */
-function resourcebundle_get_error_code(ResourceBundle $bundle) {}
+function resourcebundle_get_error_code(ResourceBundle $bundle): int {}
 
-/** @return string */
-function resourcebundle_get_error_message(ResourceBundle $bundle) {}
+function resourcebundle_get_error_message(ResourceBundle $bundle): string {}

ext/intl/resourcebundle/resourcebundle_arginfo.h

@@ -37,6 +37,10 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_resourcebundle_locales arginfo_class_ResourceBundle_getLocales
 
-#define arginfo_resourcebundle_get_error_code arginfo_resourcebundle_count
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_resourcebundle_get_error_code, 0, 1, IS_LONG, 0)
+	ZEND_ARG_OBJ_INFO(0, bundle, ResourceBundle, 0)
+ZEND_END_ARG_INFO()
 
-#define arginfo_resourcebundle_get_error_message arginfo_resourcebundle_count
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_resourcebundle_get_error_message, 0, 1, IS_STRING, 0)
+	ZEND_ARG_OBJ_INFO(0, bundle, ResourceBundle, 0)
+ZEND_END_ARG_INFO()

ext/intl/spoofchecker/spoofchecker.stub.php

@@ -10,12 +10,14 @@ public function isSuspicious(string $text, &$error = null) {}
     /** @return bool */
     public function areConfusable(string $s1, string $s2, &$error = null) {}
 
-    /** @return void */
+    /** @return null|false */
     public function setAllowedLocales(string $locale_list) {}
 
-    /** @return void */
+    /** @return null|false */
     public function setChecks(int $checks) {}
 
-    /** @return void */
+#if U_ICU_VERSION_MAJOR_NUM >= 58
+    /** @return null|false */
     public function setRestrictionLevel(int $level) {}
+#endif
 }

ext/intl/spoofchecker/spoofchecker_arginfo.h

@@ -22,6 +22,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker_setChecks, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, checks, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+#if U_ICU_VERSION_MAJOR_NUM >= 58
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Spoofchecker_setRestrictionLevel, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, level, IS_LONG, 0)
 ZEND_END_ARG_INFO()
+#endif