Merge pull request #460 from kamil-tekiela/narrow-down-types

Narrow down return types

Author: MauricioFauth

phpstan-baseline.neon

@@ -871,50 +871,20 @@ parameters:
 			path: src/Tools/TestGenerator.php
 
 		-
-			message: "#^Cannot access offset 'a' on mixed\\.$#"
-			count: 3
-			path: src/Utils/CLI.php
-
-		-
-			message: "#^Cannot access offset 'c' on mixed\\.$#"
-			count: 2
-			path: src/Utils/CLI.php
-
-		-
-			message: "#^Cannot access offset 'f' on mixed\\.$#"
-			count: 1
-			path: src/Utils/CLI.php
-
-		-
-			message: "#^Cannot access offset 'h' on mixed\\.$#"
-			count: 3
-			path: src/Utils/CLI.php
-
-		-
-			message: "#^Cannot access offset 'q' on mixed\\.$#"
-			count: 12
-			path: src/Utils/CLI.php
-
-		-
-			message: "#^Parameter \\#1 \\$context of static method PhpMyAdmin\\\\SqlParser\\\\Context\\:\\:load\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$context of static method PhpMyAdmin\\\\SqlParser\\\\Context\\:\\:load\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
 			path: src/Utils/CLI.php
 
 		-
-			message: "#^Parameter \\#1 \\$query of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Formatter\\:\\:format\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$query of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Formatter\\:\\:format\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
 			path: src/Utils/CLI.php
 
 		-
-			message: "#^Parameter \\#1 \\$str of class PhpMyAdmin\\\\SqlParser\\\\Lexer constructor expects PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$str of class PhpMyAdmin\\\\SqlParser\\\\Lexer constructor expects PhpMyAdmin\\\\SqlParser\\\\UtfString\\|string, string\\|false given\\.$#"
 			count: 2
 			path: src/Utils/CLI.php
 
-		-
-			message: "#^Parameter \\#2 \\$options of static method PhpMyAdmin\\\\SqlParser\\\\Utils\\\\Formatter\\:\\:format\\(\\) expects array\\<string, array\\<int, array\\<string, int\\|string\\>\\>\\|bool\\|string\\>, array\\<string, mixed\\> given\\.$#"
-			count: 1
-			path: src/Utils/CLI.php
-
 		-
 			message: "#^Argument of an invalid type array\\<int, array\\<string, int\\|string\\>\\>\\|bool\\|string supplied for foreach, only iterables are supported\\.$#"
 			count: 1

psalm-baseline.xml

@@ -5300,36 +5300,16 @@
     <InvalidReturnType>
       <code>string[]|false[]|false</code>
     </InvalidReturnType>
-    <MixedArgument>
-      <code><![CDATA[$params['c']]]></code>
-      <code><![CDATA[$params['q']]]></code>
-      <code><![CDATA[$params['q']]]></code>
-      <code><![CDATA[$params['q']]]></code>
-    </MixedArgument>
     <MixedArgumentTypeCoercion>
       <code>$idx</code>
-      <code><![CDATA[['type' => $params['f']]]]></code>
     </MixedArgumentTypeCoercion>
-    <MixedArrayAccess>
+    <PossiblyFalseArgument>
+      <code>$params</code>
+      <code>$params</code>
       <code><![CDATA[$params['c']]]></code>
-      <code><![CDATA[$params['f']]]></code>
-      <code><![CDATA[$params['q']]]></code>
-      <code><![CDATA[$params['q']]]></code>
-      <code><![CDATA[$params['q']]]></code>
-    </MixedArrayAccess>
-    <MixedArrayAssignment>
       <code><![CDATA[$params['q']]]></code>
       <code><![CDATA[$params['q']]]></code>
       <code><![CDATA[$params['q']]]></code>
-    </MixedArrayAssignment>
-    <MixedAssignment>
-      <code>$params</code>
-      <code>$params</code>
-      <code>$params</code>
-    </MixedAssignment>
-    <PossiblyFalseArgument>
-      <code>$params</code>
-      <code>$params</code>
     </PossiblyFalseArgument>
   </file>
   <file src="src/Utils/Error.php">

src/Utils/CLI.php

@@ -68,9 +68,9 @@ public function getopt($opt, $long): array|false
     }
 
     /**
-     * @return mixed|false
+     * @return string[]|false[]|false
      */
-    public function parseHighlight()
+    public function parseHighlight(): array|false
     {
         $longopts = [
             'help',
@@ -151,9 +151,9 @@ public function usageLint()
     }
 
     /**
-     * @return mixed
+     * @return string[]|false[]|false
      */
-    public function parseLint()
+    public function parseLint(): array|false
     {
         $longopts = [
             'help',
@@ -230,9 +230,9 @@ public function usageTokenize()
     }
 
     /**
-     * @return mixed
+     * @return string[]|false[]|false
      */
-    public function parseTokenize()
+    public function parseTokenize(): array|false
     {
         $longopts = [
             'help',