Remove redundant is_array check

It's always array because of `if (empty($view['name']))` check Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
phpmyadmin · Dec 14, 2022 · 99f37f4 · 99f37f4
1 parent 47d9ad9
commit 99f37f4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/libraries/classes/Controllers/View/CreateController.php b/libraries/classes/Controllers/View/CreateController.php
@@ -24,7 +24,6 @@
 use function explode;
 use function htmlspecialchars;
 use function in_array;
-use function is_array;
 use function is_string;
 use function sprintf;
 use function str_contains;
@@ -281,9 +280,7 @@ public function __invoke(ServerRequest $request): void
             }
         }
 
-        if (is_array($view)) {
-            $GLOBALS['view'] = array_merge($GLOBALS['view'], $view);
-        }
+        $GLOBALS['view'] = array_merge($GLOBALS['view'], $view);
 
         $GLOBALS['urlParams']['db'] = $GLOBALS['db'];
         $GLOBALS['urlParams']['reload'] = 1;

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -2130,11 +2130,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/UserPasswordController.php
 
-		-
-			message: "#^Call to function is_array\\(\\) with array will always evaluate to true\\.$#"
-			count: 1
-			path: libraries/classes/Controllers/View/CreateController.php
-
 		-
 			message: "#^PHPDoc tag @var for variable \\$view has no value type specified in iterable type array\\.$#"
 			count: 1

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -4196,9 +4196,8 @@
       <code>$_GET['table']</code>
       <code>$_GET['table']</code>
     </PossiblyInvalidCast>
-    <RedundantCondition occurrences="3">
+    <RedundantCondition occurrences="2">
       <code>empty($GLOBALS['view']['as']) &amp;&amp; is_string($createView)</code>
-      <code>is_array($view)</code>
       <code>is_string($createView)</code>
     </RedundantCondition>
     <RedundantConditionGivenDocblockType occurrences="1">