From 1c484a27a9cc34ad306dfd63856db49ad7cb4bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Sun, 8 Feb 2026 21:49:53 +0100 Subject: [PATCH] Update to Adminer 5.4.2 --- 5/Dockerfile | 6 +++--- 5/fastcgi/Dockerfile | 6 +++--- 5/fastcgi/index.php | 16 +++++++++++----- 5/index.php | 16 +++++++++++----- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/5/Dockerfile b/5/Dockerfile index e03c8d7..64355a2 100644 --- a/5/Dockerfile +++ b/5/Dockerfile @@ -40,9 +40,9 @@ RUN set -x \ COPY *.php /var/www/html/ -ENV ADMINER_VERSION=5.4.1 -ENV ADMINER_DOWNLOAD_SHA256=3f65364b4cc96b5e4cae1b3e448b7b6fa42b0da1eeba78bed9b3774ade830fce -ENV ADMINER_SRC_DOWNLOAD_SHA256=fd96585b1f8728b729551c5a7de3371724c1ccd701afde4c75fd6b990d935a63 +ENV ADMINER_VERSION=5.4.2 +ENV ADMINER_DOWNLOAD_SHA256=5b761efe7049bf586119256324fd417b49e5bb9243b40d9734fe86655e4402fd +ENV ADMINER_SRC_DOWNLOAD_SHA256=a4106d61bc81575d0b45c762105eead064384643418cad197a3257677625bd10 RUN set -x \ && curl -fsSL https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -o adminer.php \ diff --git a/5/fastcgi/Dockerfile b/5/fastcgi/Dockerfile index 39ccb6e..9258c75 100644 --- a/5/fastcgi/Dockerfile +++ b/5/fastcgi/Dockerfile @@ -36,9 +36,9 @@ RUN set -x \ COPY *.php /var/www/html/ -ENV ADMINER_VERSION=5.4.1 -ENV ADMINER_DOWNLOAD_SHA256=3f65364b4cc96b5e4cae1b3e448b7b6fa42b0da1eeba78bed9b3774ade830fce -ENV ADMINER_SRC_DOWNLOAD_SHA256=fd96585b1f8728b729551c5a7de3371724c1ccd701afde4c75fd6b990d935a63 +ENV ADMINER_VERSION=5.4.2 +ENV ADMINER_DOWNLOAD_SHA256=5b761efe7049bf586119256324fd417b49e5bb9243b40d9734fe86655e4402fd +ENV ADMINER_SRC_DOWNLOAD_SHA256=a4106d61bc81575d0b45c762105eead064384643418cad197a3257677625bd10 RUN set -x \ && curl -fsSL https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -o adminer.php \ diff --git a/5/fastcgi/index.php b/5/fastcgi/index.php index f336caf..934da37 100644 --- a/5/fastcgi/index.php +++ b/5/fastcgi/index.php @@ -9,13 +9,19 @@ public function __construct( private \Adminer\Adminer $adminer ) { } - public function loginFormField(...$args) { - return (function (...$args) { + public function loginFormField(...$args): string { + return (function (...$args): string { $field = $this->loginFormField(...$args); - return \str_replace( - 'name="auth[server]" value="" title="hostname[:port]"', - \sprintf('name="auth[server]" value="%s" title="hostname[:port]"', ($_ENV['ADMINER_DEFAULT_SERVER'] ?: 'db')), + return \preg_replace_callback( + '/name="auth\[server\]" value="" title="(?:[^"]+)"/', + static function (array $matches): string { + return \str_replace( + 'value=""', + \sprintf('value="%s"', ($_ENV['ADMINER_DEFAULT_SERVER'] ?: 'db')), + $matches[0], + ); + }, $field, ); })->call($this->adminer, ...$args); diff --git a/5/index.php b/5/index.php index f336caf..934da37 100644 --- a/5/index.php +++ b/5/index.php @@ -9,13 +9,19 @@ public function __construct( private \Adminer\Adminer $adminer ) { } - public function loginFormField(...$args) { - return (function (...$args) { + public function loginFormField(...$args): string { + return (function (...$args): string { $field = $this->loginFormField(...$args); - return \str_replace( - 'name="auth[server]" value="" title="hostname[:port]"', - \sprintf('name="auth[server]" value="%s" title="hostname[:port]"', ($_ENV['ADMINER_DEFAULT_SERVER'] ?: 'db')), + return \preg_replace_callback( + '/name="auth\[server\]" value="" title="(?:[^"]+)"/', + static function (array $matches): string { + return \str_replace( + 'value=""', + \sprintf('value="%s"', ($_ENV['ADMINER_DEFAULT_SERVER'] ?: 'db')), + $matches[0], + ); + }, $field, ); })->call($this->adminer, ...$args);