Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 5e8499f26f29 · 2024-09-24T21:31:25.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@mfauth.net&gt;
diff --git a/bin/internal/create-release.sh b/bin/internal/create-release.sh
@@ -148,12 +148,6 @@ cleanup_composer_vendors() {
         vendor/phpmyadmin/twig-i18n-extension/README.rst \
         vendor/phpmyadmin/twig-i18n-extension/phpunit.xml.dist \
         vendor/phpmyadmin/twig-i18n-extension/test/ \
-        vendor/phpseclib/phpseclib/phpseclib/File/ \
-        vendor/phpseclib/phpseclib/phpseclib/Math/ \
-        vendor/phpseclib/phpseclib/phpseclib/Net/ \
-        vendor/phpseclib/phpseclib/phpseclib/System/ \
-        vendor/phpseclib/phpseclib/appveyor.yml \
-        vendor/phpseclib/phpseclib/.github \
         vendor/symfony/cache/Tests/ \
         vendor/symfony/service-contracts/Test/ \
         vendor/symfony/expression-language/Tests/ \
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -5922,7 +5922,7 @@ parameters:
 
 		-
 			message: "#^Parameter \\#1 \\$string of function mb_strtolower expects string, mixed given\\.$#"
-			count: 6
+			count: 7
 			path: src/Database/Routines.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -4803,6 +4803,7 @@
       <code><![CDATA[$routine['item_name']]]></code>
       <code><![CDATA[$routine['item_param_name'][$i]]]></code>
       <code><![CDATA[$routine['item_param_name'][$i]]]></code>
+      <code><![CDATA[$routine['item_param_opts_text'][$i]]]></code>
       <code><![CDATA[$routine['item_param_type'][$i]]]></code>
       <code><![CDATA[$routine['item_param_type'][$i]]]></code>
       <code><![CDATA[$routine['item_param_type'][$i]]]></code>
diff --git a/src/Database/Routines.php b/src/Database/Routines.php
@@ -596,7 +596,7 @@ public function getParameterRow(array $routine = [], mixed $index = null, string
             $charsets[] = [
                 'name' => $charset->getName(),
                 'description' => $charset->getDescription(),
-                'is_selected' => $charset->getName() === $routine['item_param_opts_text'][$i],
+                'is_selected' => $charset->getName() === mb_strtolower($routine['item_param_opts_text'][$i]),
             ];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -5922,7 +5922,7 @@ parameters:`
`5922`	`5922`
`5923`	`5923`	`-`
`5924`	`5924`	`message: "#^Parameter \\#1 \\$string of function mb_strtolower expects string, mixed given\\.$#"`
`5925`		`- count: 6`
	`5925`	`+ count: 7`
`5926`	`5926`	`path: src/Database/Routines.php`
`5927`	`5927`
`5928`	`5928`	`-`
Original file line number	Diff line number	Diff line change
`@@ -596,7 +596,7 @@ public function getParameterRow(array $routine = [], mixed $index = null, string`
`596`	`596`	`$charsets[] = [`
`597`	`597`	`'name' => $charset->getName(),`
`598`	`598`	`'description' => $charset->getDescription(),`
`599`		`- 'is_selected' => $charset->getName() === $routine['item_param_opts_text'][$i],`
	`599`	`+ 'is_selected' => $charset->getName() === mb_strtolower($routine['item_param_opts_text'][$i]),`
`600`	`600`	`];`
`601`	`601`	`}`
`602`	`602`