From 9afbb61a79b97e29ee8f90a5f129961d58197028 Mon Sep 17 00:00:00 2001 From: Masahiro Fujimoto Date: Thu, 5 Aug 2021 02:52:48 +0000 Subject: [PATCH 1/4] Translated using Weblate (Japanese) Currently translated at 100.0% (3384 of 3384 strings) [ci skip] Translation: phpMyAdmin/5.1 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-1/ja/ Signed-off-by: Masahiro Fujimoto --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 025cf1d90d..3d13fa8674 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.1.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2021-06-04 11:50-0300\n" -"PO-Revision-Date: 2021-07-09 09:20+0000\n" +"PO-Revision-Date: 2021-08-06 03:33+0000\n" "Last-Translator: Masahiro Fujimoto \n" "Language-Team: Japanese \n" @@ -7160,8 +7160,7 @@ msgstr "エラーレポートの詳細を表示" msgid "" "Your export is incomplete, due to a low execution time limit at the PHP " "level!" -msgstr "" -"PHPで設定された低い実行時間制限のため、エクスポートは完了しませんでした！" +msgstr "PHP レベルで設定された実行時間制限が短すぎるため、エクスポートが完了しませんでした。" #: libraries/classes/Controllers/JavaScriptMessagesController.php:652 #, php-format From c0fe75bc6708d2313eec58e238c68e47a8e207ad Mon Sep 17 00:00:00 2001 From: Lukas Bixen Date: Sat, 7 Aug 2021 12:07:30 -0500 Subject: [PATCH 2/4] Fix `DEL` character in generated random strings Apply suggestions from code review: Use identical operator and improve comment Signed-off-by: Lukas Bixen --- libraries/classes/Util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index e27f202429..7acaf42cbf 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -3017,8 +3017,8 @@ class Util // Get random byte and strip highest bit // to get ASCII only range $byte = ord((string) $random_func(1)) & 0x7f; - // We want only ASCII chars - if ($byte <= 32) { + // We want only ASCII chars and no DEL character (127) + if ($byte <= 32 || $byte === 127) { continue; } From 48c78e2f53d05a99b761c745ccd70b68d91fbc12 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 8 Aug 2021 02:02:48 +0200 Subject: [PATCH 3/4] Add a ChangeLog entry for #17054 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 4f9ce97809..bc3a89bf91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,7 @@ phpMyAdmin - ChangeLog - issue #13614 Fixed escaping the database names when granting privileges on tables - issue #11834 Fixed adding a new user on "privileges" tab of a table with a database name using a "_" character - issue #17033 Fixed scaling of line width and point size in GIS visualization +- issue #17054 Removed "DEL" character from generated random strings for Blowfish secret auto-generated by setup 5.1.1 (2021-06-04) - issue #13325 Fixed created procedure shows up in triggers and events and vice-versa From ce9f1ecab018a6181afef7846505a626b43b068f Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 8 Aug 2021 02:37:37 +0200 Subject: [PATCH 4/4] Update psalm to ^4.9.2 Signed-off-by: William Desportes --- composer.json | 2 +- psalm-baseline.xml | 32 +++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index f9fd00e4cb..4673dbe63d 100644 --- a/composer.json +++ b/composer.json @@ -93,7 +93,7 @@ "symfony/finder": "^4.4", "symfony/twig-bridge": "^4.4", "tecnickcom/tcpdf": "^6.4.2", - "vimeo/psalm": "^4.8.0" + "vimeo/psalm": "^4.9.2" }, "extra": { "branch-alias": { diff --git a/psalm-baseline.xml b/psalm-baseline.xml index af4ea94885..d939373ef8 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + (int) $this->id @@ -181,9 +181,6 @@ $valueDefault $valueDefaultJs - - $values[$path] - @@ -244,14 +241,19 @@ $success $success - + + $_GET['db'] $display_page $display_page $page + $selected_page $tab_pos + + $_GET['db'] + @@ -388,8 +390,12 @@ - + + $this->collations[$charset->getName()] + + $this->charsets + $this->collations[$charset->getName()] @@ -444,6 +450,9 @@ $this->config->getServers() + + PMA_IS_WINDOWS + @@ -939,9 +948,6 @@ int - - $db_select - $line $line @@ -1670,6 +1676,11 @@ (string) $currentDb + + + $output + + $this->showColor @@ -2176,6 +2187,9 @@ + + $output + (string) $styles (string) $styles