Fix issue in VersionInformation class reported by PHPStan

MauricioFauth · MauricioFauth · commit 05bd23addf7d · 2022-03-31T13:32:24.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
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

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`use function intval;`
`16`	`16`	`use function is_numeric;`
`17`	`17`	`use function is_object;`
	`18`	`+use function is_string;`
`18`	`19`	`use function json_decode;`
`19`	`20`	`use function preg_match;`
`20`	`21`	`use function strlen;`
`@@ -228,7 +229,7 @@ public function evaluateVersionCondition(string $type, string $condition)`
`228`	`229`	`$myVersion = $this->getMySQLVersion();`
`229`	`230`	`}`
`230`	`231`
`231`		`- if ($myVersion !== null && $version !== null && $operator !== null) {`
	`232`	`+ if (is_string($myVersion) && is_string($version) && is_string($operator)) {`
`232`	`233`	`return version_compare($myVersion, $version, $operator);`
`233`	`234`	`}`
`234`	`235`