]> granicus.if.org Git - php/commitdiff
Fix opcache return type info for pgsql functions
authorMáté Kocsis <kocsismate@woohoolabs.com>
Wed, 9 Sep 2020 19:43:44 +0000 (21:43 +0200)
committerMáté Kocsis <kocsismate@woohoolabs.com>
Wed, 9 Sep 2020 19:43:44 +0000 (21:43 +0200)
ext/opcache/Optimizer/zend_func_info.c

index a387942919cb6dbc2ac3de6a20d1b773444370cd..60e2e64861dd179df11abbbc34c4044c6d963618 100644 (file)
@@ -689,91 +689,53 @@ static const func_info_t func_infos[] = {
        /* ext/pgsql */
        F1("pg_connect",                                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
        FN("pg_pconnect",                                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
-       F0("pg_connect_poll",                                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("pg_close",                                                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F1("pg_dbname",                                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("pg_last_error",                                                     MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("pg_options",                                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("pg_port",                                                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("pg_tty",                                                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("pg_host",                                                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("pg_version",                                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
+       F1("pg_dbname",                                                         MAY_BE_STRING),
+       F1("pg_last_error",                                                     MAY_BE_STRING),
+       F1("pg_options",                                                        MAY_BE_STRING),
+       F1("pg_port",                                                           MAY_BE_STRING),
+       F1("pg_tty",                                                            MAY_BE_STRING),
+       F1("pg_host",                                                           MAY_BE_STRING),
+       F1("pg_version",                                                        MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
        F1("pg_parameter_status",                                       MAY_BE_FALSE | MAY_BE_STRING),
-       F0("pg_ping",                                                           MAY_BE_FALSE | MAY_BE_TRUE),
-       F1("pg_query",                                                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
-       F1("pg_query_params",                                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
-       F1("pg_prepare",                                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
-       F1("pg_execute",                                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
-       F0("pg_num_rows",                                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("pg_num_fields",                                                     MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("pg_affected_rows",                                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       FN("pg_last_notice",                                            UNKNOWN_INFO),
-       F1("pg_field_table",                                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
-       F1("pg_field_name",                                                     MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F0("pg_field_size",                                                     MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F1("pg_field_type",                                                     MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("pg_field_type_oid",                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
-       F0("pg_field_num",                                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
+       F1("pg_query",                                                          MAY_BE_FALSE | MAY_BE_RESOURCE),
+       F1("pg_query_params",                                           MAY_BE_FALSE | MAY_BE_RESOURCE),
+       F1("pg_prepare",                                                        MAY_BE_FALSE | MAY_BE_RESOURCE),
+       F1("pg_execute",                                                        MAY_BE_FALSE | MAY_BE_RESOURCE),
+       FN("pg_last_notice",                                            MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY ),
+       F1("pg_field_table",                                            MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
+       F1("pg_field_name",                                                     MAY_BE_FALSE | MAY_BE_STRING),
+       F1("pg_field_type",                                                     MAY_BE_FALSE | MAY_BE_STRING),
+       F1("pg_field_type_oid",                                         MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
        F1("pg_fetch_result",                                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("pg_fetch_row",                                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING),
-       F1("pg_fetch_assoc",                                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING),
-       F1("pg_fetch_array",                                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING),
-       F1("pg_fetch_object",                                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT),
-       F1("pg_fetch_all",                                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ARRAY),
-       F1("pg_fetch_all_columns",                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING),
-       F0("pg_result_seek",                                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F0("pg_field_prtlen",                                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("pg_field_is_null",                                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("pg_free_result",                                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F1("pg_last_oid",                                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
-       F0("pg_trace",                                                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F0("pg_untrace",                                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F1("pg_lo_create",                                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
-       F0("pg_lo_unlink",                                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F1("pg_lo_open",                                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
-       F1("pg_lo_read",                                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F0("pg_lo_write",                                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("pg_lo_read_all",                                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F1("pg_lo_import",                                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
-       F0("pg_lo_export",                                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F0("pg_lo_seek",                                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F0("pg_lo_tell",                                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("pg_lo_truncate",                                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F0("pg_set_error_verbosity",                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("pg_set_client_encoding",                            MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("pg_end_copy",                                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F0("pg_put_line",                                                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F1("pg_copy_to",                                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
-       F0("pg_copy_from",                                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F1("pg_escape_string",                                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("pg_escape_bytea",                                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("pg_unescape_bytea",                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("pg_escape_literal",                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
+       F1("pg_fetch_row",                                                      MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING),
+       F1("pg_fetch_assoc",                                            MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING),
+       F1("pg_fetch_array",                                            MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING),
+       F1("pg_fetch_object",                                           MAY_BE_FALSE | MAY_BE_OBJECT),
+       F1("pg_fetch_all",                                                      MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ARRAY),
+       F1("pg_fetch_all_columns",                                      MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING),
+       F1("pg_last_oid",                                                       MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
+       F1("pg_lo_create",                                                      MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
+       F1("pg_lo_open",                                                        MAY_BE_FALSE | MAY_BE_RESOURCE),
+       F1("pg_lo_read",                                                        MAY_BE_FALSE | MAY_BE_STRING),
+       F1("pg_lo_import",                                                      MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
+       F1("pg_copy_to",                                                        MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
+       F1("pg_escape_string",                                          MAY_BE_STRING),
+       F1("pg_escape_bytea",                                           MAY_BE_STRING),
+       F1("pg_unescape_bytea",                                         MAY_BE_FALSE | MAY_BE_STRING),
+       F1("pg_escape_literal",                                         MAY_BE_FALSE | MAY_BE_STRING),
        F1("pg_escape_identifier",                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
        F1("pg_result_error",                                           MAY_BE_FALSE | MAY_BE_STRING),
-       F1("pg_result_error_field",                                     MAY_BE_FALSE | MAY_BE_STRING),
-       F0("pg_connection_status",                                      MAY_BE_FALSE | MAY_BE_LONG),
-       F0("pg_transaction_status",                                     MAY_BE_FALSE | MAY_BE_LONG),
-       F0("pg_connection_reset",                                       MAY_BE_FALSE | MAY_BE_TRUE),
-       F0("pg_cancel_query",                                           MAY_BE_FALSE | MAY_BE_TRUE),
-       F0("pg_connection_busy",                                        MAY_BE_FALSE | MAY_BE_TRUE),
-       F0("pg_send_query",                                                     MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_LONG),
-       F0("pg_send_query_params",                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_LONG),
-       F0("pg_send_prepare",                                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_LONG),
-       F0("pg_send_execute",                                           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_LONG),
+       F1("pg_result_error_field",                                     MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
        F1("pg_get_result",                                                     MAY_BE_FALSE | MAY_BE_RESOURCE),
-       F1("pg_result_status",                                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
+       F1("pg_result_status",                                          MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
        F1("pg_get_notify",                                                     MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY),
-       F0("pg_get_pid",                                                        MAY_BE_FALSE | MAY_BE_LONG),
-       F1("pg_socket",                                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE),
-       F0("pg_consume_input",                                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
-       F0("pg_flush",                                                          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_LONG),
-       F1("pg_meta_data",                                                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ARRAY),
-       F1("pg_convert",                                                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
-       F1("pg_insert",                                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_RESOURCE | MAY_BE_STRING),
-       F1("pg_update",                                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
-       F1("pg_delete",                                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
-       F1("pg_select",                                                         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ARRAY),
+       F1("pg_socket",                                                         MAY_BE_FALSE | MAY_BE_RESOURCE),
+       F1("pg_meta_data",                                                      MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ARRAY),
+       F1("pg_convert",                                                        MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
+       F1("pg_insert",                                                         MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_RESOURCE | MAY_BE_STRING),
+       F1("pg_update",                                                         MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
+       F1("pg_delete",                                                         MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
+       F1("pg_select",                                                         MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ARRAY),
 
        /* ext/bcmath */
        F1("bcadd",                                                                     MAY_BE_STRING),