Merge pull request #18894 from kamil-tekiela/LanguageManager

MauricioFauth · web-flow · commit 6ee9e7d1aa5a · 2024-01-09T19:15:45.000-03:00
Fix type hint in LanguageManager
diff --git a/composer.lock b/composer.lock
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -9836,7 +9836,7 @@ parameters:
 			path: src/LanguageManager.php
 
 		-
-			message: "#^Method PhpMyAdmin\\\\LanguageManager\\:\\:availableLocales\\(\\) should return array but returns array\\|false\\.$#"
+			message: "#^Method PhpMyAdmin\\\\LanguageManager\\:\\:availableLocales\\(\\) should return array\\<string\\> but returns array\\|false\\.$#"
 			count: 1
 			path: src/LanguageManager.php
 
@@ -9857,11 +9857,11 @@ parameters:
 
 		-
 			message: "#^Parameter \\#1 \\$string of function strtolower expects string, mixed given\\.$#"
-			count: 2
+			count: 1
 			path: src/LanguageManager.php
 
 		-
-			message: "#^Property PhpMyAdmin\\\\LanguageManager\\:\\:\\$availableLocales \\(array\\) does not accept array\\|false\\.$#"
+			message: "#^Property PhpMyAdmin\\\\LanguageManager\\:\\:\\$availableLocales \\(array\\<string\\>\\) does not accept array\\|false\\.$#"
 			count: 1
 			path: src/LanguageManager.php
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
+<files psalm-version="5.19.0@06b71be009a6bd6d81b9811855d6629b9fe90e1b">
   <file src="app/services_loader.php">
     <MixedArgument>
       <code>$argumentName</code>
@@ -6968,20 +6968,13 @@
     <MixedArgument>
       <code><![CDATA[$config->get('Lang')]]></code>
       <code><![CDATA[$config->getCookie('pma_lang')]]></code>
-      <code>$lang</code>
     </MixedArgument>
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$this->listLocaleDir()]]></code>
-    </MixedArgumentTypeCoercion>
     <MixedArrayOffset>
       <code><![CDATA[$langs[$config->get('DefaultLang')]]]></code>
     </MixedArrayOffset>
     <MixedArrayTypeCoercion>
       <code><![CDATA[$langs[$config->get('DefaultLang')]]]></code>
     </MixedArrayTypeCoercion>
-    <MixedAssignment>
-      <code>$lang</code>
-    </MixedAssignment>
     <MixedOperand>
       <code><![CDATA[$config->get('FilterLanguages')]]></code>
     </MixedOperand>
diff --git a/src/LanguageManager.php b/src/LanguageManager.php
@@ -708,7 +708,7 @@ class LanguageManager
         ],
     ];
 
-    /** @var mixed[] */
+    /** @var string[] */
     private array $availableLocales = [];
 
     /** @var array<string, Language> */
@@ -740,7 +740,7 @@ public static function getInstance(): LanguageManager
     /**
      * Returns list of available locales
      *
-     * @return mixed[]
+     * @return string[]
      */
     public function listLocaleDir(): array
     {
@@ -780,7 +780,7 @@ public function listLocaleDir(): array
     /**
      * Returns (cached) list of all available locales
      *
-     * @return mixed[] of strings
+     * @return string[]
      */
     public function availableLocales(): array
     {

Original file line number	Diff line number	Diff line change
`@@ -9836,7 +9836,7 @@ parameters:`
`9836`	`9836`	`path: src/LanguageManager.php`
`9837`	`9837`
`9838`	`9838`	`-`
`9839`		`- message: "#^Method PhpMyAdmin\\\\LanguageManager\\:\\:availableLocales\\(\\) should return array but returns array\\\|false\\.$#"`
	`9839`	`+ message: "#^Method PhpMyAdmin\\\\LanguageManager\\:\\:availableLocales\\(\\) should return array\\<string\\> but returns array\\\|false\\.$#"`
`9840`	`9840`	`count: 1`
`9841`	`9841`	`path: src/LanguageManager.php`
`9842`	`9842`
`@@ -9857,11 +9857,11 @@ parameters:`
`9857`	`9857`
`9858`	`9858`	`-`
`9859`	`9859`	`message: "#^Parameter \\#1 \\$string of function strtolower expects string, mixed given\\.$#"`
`9860`		`- count: 2`
	`9860`	`+ count: 1`
`9861`	`9861`	`path: src/LanguageManager.php`
`9862`	`9862`
`9863`	`9863`	`-`
`9864`		`- message: "#^Property PhpMyAdmin\\\\LanguageManager\\:\\:\\$availableLocales \\(array\\) does not accept array\\\|false\\.$#"`
	`9864`	`+ message: "#^Property PhpMyAdmin\\\\LanguageManager\\:\\:\\$availableLocales \\(array\\<string\\>\\) does not accept array\\\|false\\.$#"`
`9865`	`9865`	`count: 1`
`9866`	`9866`	`path: src/LanguageManager.php`
`9867`	`9867`
Original file line number	Diff line number	Diff line change
`@@ -708,7 +708,7 @@ class LanguageManager`
`708`	`708`	`],`
`709`	`709`	`];`
`710`	`710`
`711`		`- /** @var mixed[] */`
	`711`	`+ /** @var string[] */`
`712`	`712`	`private array $availableLocales = [];`
`713`	`713`
`714`	`714`	`/** @var array<string, Language> */`
`@@ -740,7 +740,7 @@ public static function getInstance(): LanguageManager`
`740`	`740`	`/**`
`741`	`741`	`* Returns list of available locales`
`742`	`742`	`*`
`743`		`- * @return mixed[]`
	`743`	`+ * @return string[]`
`744`	`744`	`*/`
`745`	`745`	`public function listLocaleDir(): array`
`746`	`746`	`{`
`@@ -780,7 +780,7 @@ public function listLocaleDir(): array`
`780`	`780`	`/**`
`781`	`781`	`* Returns (cached) list of all available locales`
`782`	`782`	`*`
`783`		`- * @return mixed[] of strings`
	`783`	`+ * @return string[]`
`784`	`784`	`*/`
`785`	`785`	`public function availableLocales(): array`
`786`	`786`	`{`