diff --git a/libraries/classes/Setup/Index.php b/libraries/classes/Setup/Index.php index f03a1bbd7a..76a1c9f600 100644 --- a/libraries/classes/Setup/Index.php +++ b/libraries/classes/Setup/Index.php @@ -140,28 +140,8 @@ class Index $date = $latestCompatible['date']; $versionUpstream = $versionInformation->versionToInt($version); - if ($versionUpstream === false) { - self::messagesSet( - 'error', - $messageId, - __('Version check'), - __('Got invalid version string from server'), - ); - - return; - } $versionLocal = $versionInformation->versionToInt(Version::VERSION); - if ($versionLocal === false) { - self::messagesSet( - 'error', - $messageId, - __('Version check'), - __('Unparsable version string'), - ); - - return; - } if ($versionUpstream > $versionLocal) { $version = htmlspecialchars($version); diff --git a/libraries/classes/VersionInformation.php b/libraries/classes/VersionInformation.php index 9ff11b3d24..db53a82359 100644 --- a/libraries/classes/VersionInformation.php +++ b/libraries/classes/VersionInformation.php @@ -77,10 +77,8 @@ class VersionInformation * Calculates numerical equivalent of phpMyAdmin version string * * @param string $version version - * - * @return mixed false on failure, integer on success */ - public function versionToInt(string $version): mixed + public function versionToInt(string $version): int { $parts = explode('-', $version); if (count($parts) > 1) { diff --git a/psalm-baseline.xml b/psalm-baseline.xml index b44b33871a..4943712649 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -12573,12 +12573,7 @@ $removeIds[] $type $version - $versionLocal - $versionUpstream - - $versionLocal -