Generate a few missing optimizer function entries from stubs

php · Aug 25, 2021 · d379044 · d379044
1 parent 4a7a414
commit d379044
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/Zend/Optimizer/zend_func_infos.h b/Zend/Optimizer/zend_func_infos.h
@@ -25,6 +25,9 @@ static const func_info_t func_infos[] = {
     F1("spl_classes", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING),
     F1("spl_object_hash", MAY_BE_STRING),
     FN("socket_export_stream", MAY_BE_RESOURCE|MAY_BE_FALSE),
+    FN("dba_popen", MAY_BE_RESOURCE|MAY_BE_FALSE),
+    FN("dba_open", MAY_BE_RESOURCE|MAY_BE_FALSE),
+    FN("bzopen", MAY_BE_RESOURCE|MAY_BE_FALSE),
     F1("gzopen", MAY_BE_RESOURCE|MAY_BE_FALSE),
 #if HAVE_NANOSLEEP
     F1("time_nanosleep", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_BOOL),
@@ -60,6 +63,31 @@ static const func_info_t func_infos[] = {
     FN("oci_get_implicit_resultset", MAY_BE_RESOURCE|MAY_BE_FALSE),
     FN("oci_password_change", MAY_BE_RESOURCE|MAY_BE_BOOL),
     FN("oci_new_cursor", MAY_BE_RESOURCE|MAY_BE_FALSE),
+    FN("odbc_prepare", MAY_BE_RESOURCE|MAY_BE_FALSE),
+    FN("odbc_exec", MAY_BE_RESOURCE|MAY_BE_FALSE),
+    FN("odbc_connect", MAY_BE_RESOURCE|MAY_BE_FALSE),
+    FN("odbc_pconnect", MAY_BE_RESOURCE|MAY_BE_FALSE),
+    FN("odbc_tables", MAY_BE_RESOURCE|MAY_BE_FALSE),
+    FN("odbc_columns", MAY_BE_RESOURCE|MAY_BE_FALSE),
+    FN("odbc_gettypeinfo", MAY_BE_RESOURCE|MAY_BE_FALSE),
+    FN("odbc_primarykeys", MAY_BE_RESOURCE|MAY_BE_FALSE),
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
+    FN("odbc_procedurecolumns", MAY_BE_RESOURCE|MAY_BE_FALSE),
+#endif
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
+    FN("odbc_procedures", MAY_BE_RESOURCE|MAY_BE_FALSE),
+#endif
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
+    FN("odbc_foreignkeys", MAY_BE_RESOURCE|MAY_BE_FALSE),
+#endif
+    FN("odbc_specialcolumns", MAY_BE_RESOURCE|MAY_BE_FALSE),
+    FN("odbc_statistics", MAY_BE_RESOURCE|MAY_BE_FALSE),
+#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35)
+    FN("odbc_tableprivileges", MAY_BE_RESOURCE|MAY_BE_FALSE),
+#endif
+#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("pg_socket", MAY_BE_RESOURCE|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),
 };
diff --git a/ext/readline/readline.stub.php b/ext/readline/readline.stub.php
@@ -4,10 +4,7 @@
 
 function readline(?string $prompt = null): string|false {}
 
-/**
- * @param int|string|bool|null $value
- * @return array|int|string|bool|null
- */
+/** @param int|string|bool|null $value */
 function readline_info(?string $var_name = null, $value = null): mixed {}
 
 function readline_add_history(string $prompt): bool {}

diff --git a/ext/readline/readline_arginfo.h b/ext/readline/readline_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: d121fe2e6860eb29eba0b4d34c446cd08e3c6f43 */
+ * Stub hash: aab1331f5ba0d8beeb62d5961ece7dc96a99a74c */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_readline, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, prompt, IS_STRING, 1, "null")