Fix issue in VersionInformation class reported by PHPStan

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Mar 31, 2022 · 05bd23a · 05bd23a
1 parent 5b03d32
commit 05bd23a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/libraries/classes/VersionInformation.php b/libraries/classes/VersionInformation.php
@@ -15,6 +15,7 @@
 use function intval;
 use function is_numeric;
 use function is_object;
+use function is_string;
 use function json_decode;
 use function preg_match;
 use function strlen;
@@ -228,7 +229,7 @@ public function evaluateVersionCondition(string $type, string $condition)
             $myVersion = $this->getMySQLVersion();
         }
 
-        if ($myVersion !== null && $version !== null && $operator !== null) {
+        if (is_string($myVersion) && is_string($version) && is_string($operator)) {
             return version_compare($myVersion, $version, $operator);
         }
 

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -4375,11 +4375,6 @@ parameters:
 			count: 1
 			path: libraries/classes/IndexColumn.php
 
-		-
-			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
-			count: 1
-			path: libraries/classes/InsertEdit.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\InsertEdit\\:\\:analyzeTableColumnsArray\\(\\) has parameter \\$column with no value type specified in iterable type array\\.$#"
 			count: 1