Add more specific array return type hints for various extensions - part 3 (#7467)

kocsismate · web-flow · commit 6a47831e6e8f · 2021-09-06T12:27:28.000+02:00
diff --git a/Zend/Optimizer/zend_func_infos.h b/Zend/Optimizer/zend_func_infos.h
@@ -181,6 +181,11 @@ static const func_info_t func_infos[] = {
     F1("iconv_get_encoding", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING|MAY_BE_STRING|MAY_BE_FALSE),
     F1("json_encode", MAY_BE_STRING|MAY_BE_FALSE),
     F1("json_last_error_msg", MAY_BE_STRING),
+    F1("ldap_get_entries", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_FALSE),
+    F1("ldap_get_attributes", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY),
+    F1("ldap_get_values_len", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_FALSE),
+    F1("ldap_explode_dn", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_FALSE),
+    FN("libxml_get_errors", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_OBJECT),
     F1("mb_language", MAY_BE_STRING|MAY_BE_BOOL),
     F1("mb_internal_encoding", MAY_BE_STRING|MAY_BE_BOOL),
     F1("mb_http_input", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_STRING|MAY_BE_FALSE),
@@ -326,12 +331,15 @@ static const func_info_t func_infos[] = {
 #if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35)
     FN("odbc_columnprivileges", MAY_BE_RESOURCE|MAY_BE_FALSE),
 #endif
+    F1("opcache_get_status", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_FALSE),
+    F1("opcache_get_configuration", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_FALSE),
     FN("pcntl_signal_get_handler", MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_OBJECT|MAY_BE_OBJECT|MAY_BE_LONG),
     FN("preg_replace", MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING|MAY_BE_NULL),
     FN("preg_filter", MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING|MAY_BE_NULL),
     FN("preg_replace_callback", MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING|MAY_BE_NULL),
     F1("preg_split", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_FALSE),
     F1("preg_grep", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF|MAY_BE_FALSE),
+    F1("pdo_drivers", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING),
     F1("pg_dbname", MAY_BE_STRING),
     F1("pg_options", MAY_BE_STRING),
     F1("pg_port", MAY_BE_STRING),
diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php
@@ -68,21 +68,41 @@ function ldap_first_entry(LDAP\Connection $ldap, LDAP\Result $result): LDAP\Resu
 
     function ldap_next_entry(LDAP\Connection $ldap, LDAP\ResultEntry $entry): LDAP\ResultEntry|false {}
 
+    /**
+     * @return array<int|string, int|array>|false
+     * @refcount 1
+     */
     function ldap_get_entries(LDAP\Connection $ldap, LDAP\Result $result): array|false {}
 
     function ldap_first_attribute(LDAP\Connection $ldap, LDAP\ResultEntry $entry): string|false {}
 
     function ldap_next_attribute(LDAP\Connection $ldap, LDAP\ResultEntry $entry): string|false {}
 
+    /**
+     * @return array<int|string, int|string|array>
+     * @refcount 1
+     */
     function ldap_get_attributes(LDAP\Connection $ldap, LDAP\ResultEntry $entry): array {}
 
+    /**
+     * @return array<int|string, int|string>|false
+     * @refcount 1
+     */
     function ldap_get_values_len(LDAP\Connection $ldap, LDAP\ResultEntry $entry, string $attribute): array|false {}
 
-    /** @alias ldap_get_values_len */
+    /**
+     * @return array<int|string, int|string>|false
+     * @refcount 1
+     * @alias ldap_get_values_len
+     */
     function ldap_get_values(LDAP\Connection $ldap, LDAP\ResultEntry $entry, string $attribute): array|false {}
 
     function ldap_get_dn(LDAP\Connection $ldap, LDAP\ResultEntry $entry): string|false {}
 
+    /**
+     * @return array<int|string, int|string>|false
+     * @refcount 1
+     */
     function ldap_explode_dn(string $dn, int $with_attrib): array|false {}
 
     function ldap_dn2ufn(string $dn): string|false {}
diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a1beb155767af8500567030b493d9d3ec408270a */
+ * Stub hash: 9f90cc4f751725c503bf4afd2b6c5e5b4e0379c8 */
 
 #if defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ldap_connect, 0, 0, LDAP\\Connection, MAY_BE_FALSE)
diff --git a/ext/libxml/libxml.stub.php b/ext/libxml/libxml.stub.php
@@ -19,6 +19,7 @@ function libxml_use_internal_errors(?bool $use_errors = null): bool {}
 
 function libxml_get_last_error(): LibXMLError|false {}
 
+/** @return array<int, LibXMLError> */
 function libxml_get_errors(): array {}
 
 function libxml_clear_errors(): void {}
diff --git a/ext/libxml/libxml_arginfo.h b/ext/libxml/libxml_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 252fdc1cd83d2d3322cc040baf2bf3c7fde29254 */
+ * Stub hash: 4bde2f5c4e55b6e0c273b0d8605cb765cc9f8400 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_libxml_set_streams_context, 0, 1, IS_VOID, 0)
 	ZEND_ARG_INFO(0, context)
diff --git a/ext/opcache/opcache.stub.php b/ext/opcache/opcache.stub.php
@@ -4,12 +4,20 @@
 
 function opcache_reset(): bool {}
 
+/**
+ * @return array<string, mixed>|false
+ * @refcount 1
+ */
 function opcache_get_status(bool $include_scripts = true): array|false {}
 
 function opcache_compile_file(string $filename): bool {}
 
 function opcache_invalidate(string $filename, bool $force = false): bool {}
 
+/**
+ * @return array<string, mixed>|false
+ * @refcount 1
+ */
 function opcache_get_configuration(): array|false {}
 
 function opcache_is_script_cached(string $filename): bool {}
diff --git a/ext/opcache/opcache_arginfo.h b/ext/opcache/opcache_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 919d85eb3f3e1127ea3911051f1d98340e84654e */
+ * Stub hash: 81f337ea4ac5361ca4a0873fcd3b033beaf524c6 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_opcache_reset, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
diff --git a/ext/pdo/pdo.stub.php b/ext/pdo/pdo.stub.php
@@ -7,4 +7,8 @@ class PDOException extends RuntimeException
     public ?array $errorInfo = null;
 }
 
+/**
+ * @return array<int, string>
+ * @refcount 1
+ */
 function pdo_drivers(): array {}
diff --git a/ext/pdo/pdo_arginfo.h b/ext/pdo/pdo_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 5cb75e0f0869651dd616b11c3bd0d407deb3c6df */
+ * Stub hash: 52ee252fdfc80d4d076f1c49842e333c27ed5102 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pdo_drivers, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,8 @@ class PDOException extends RuntimeException`
`7`	`7`	`public ?array $errorInfo = null;`
`8`	`8`	`}`
`9`	`9`
	`10`	`+/**`
	`11`	`+ * @return array<int, string>`
	`12`	`+ * @refcount 1`
	`13`	`+ */`
`10`	`14`	`function pdo_drivers(): array {}`