From bd823716fc016ef2675958ad882173e09152d264 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 28 Mar 2025 16:17:26 +0100 Subject: [PATCH] Elastic: Fix types --- adminer/include/functions.inc.php | 8 +++++--- plugins/drivers/elastic.php | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php index a38f28ba..58db6475 100644 --- 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 4f25890d..859256c7 100644 --- 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]);