Elastic: Fix types

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index a38f28ba17d9b7b8f49816088a2e985c9e1ceef7..58db6475f5013a3dedb5b91385b6aa4bf9b93dfb 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -328,7 +328,7 @@ function convert_fields(array $columns, array $fields, array $select = array()):
 /** Set cookie valid on current path
 * @param int $lifetime number of seconds, 0 for session cookie, 2592000 - 30 days
 */
-function cookie(string $name, string $value, int $lifetime = 2592000): void {
+function cookie(string $name, ?string $value, int $lifetime = 2592000): void {
        global $HTTPS;
        header(
                "Set-Cookie: $name=" . urlencode($value)
@@ -491,8 +491,10 @@ function apply_queries(string $query, array $tables, $escape = 'Adminer\table'):
        return true;
 }
 
-/** Redirect by remembered queries */
-function queries_redirect(string $location, string $message, bool $redirect): bool {
+/** Redirect by remembered queries
+* @param bool $redirect
+*/
+function queries_redirect(string $location, string $message, $redirect): bool {
        $queries = implode("\n", Queries::$queries);
        $time = format_time(Queries::$start);
        return query_redirect($queries, $location, $message, $redirect, false, !$redirect, $time);

diff --git a/plugins/drivers/elastic.php b/plugins/drivers/elastic.php
index 4f25890daacd8b878658f5a05f84222a80c10d58..859256c7326141ca0db3679bdea5bc49a92f7ae9 100644 (file)
--- a/plugins/drivers/elastic.php
+++ b/plugins/drivers/elastic.php
@@ -508,10 +508,14 @@ if (isset($_GET["elastic"])) {
        function found_rows($table_status, $where) {
        }
 
+       function auto_increment(): string {
+               return '';
+       }
+
        /** Alter type
         * @return mixed
         */
-       function alter_table(array $table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
+       function alter_table(string $table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
                $properties = array();
                foreach ($fields as $f) {
                        $field_name = trim($f[1][0]);