Remove duplication

Author: vmcj

webapp/composer.json

@@ -111,8 +111,7 @@
 		"twig/extra-bundle": "^3.5",
 		"twig/markdown-extra": "^3.5",
 		"twig/string-extra": "^3.5",
-		"twig/twig": "^3.6",
-		"z4kn4fein/php-semver": "^3.0"
+		"twig/twig": "^3.6"
 	},
 	"require-dev": {
 		"ext-dom": "*",

webapp/composer.lock

@@ -64,7 +64,6 @@
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Twig\Environment;
-use z4kn4fein\SemVer\Version;
 use ZipArchive;
 
 class DOMJudgeService
@@ -1679,54 +1678,37 @@ public function getAllowedLanguagesForContest(?Contest $contest) : array {
     public function checkNewVersion(): string|false {
         if (!$this->config->get('check_new_version')) {
             return false;
-	}
-        $versionLocalString = explode("/", str_replace("DEV", "-prerelease", $this->domjudgeVersion))[0];
-        $versionLocal = Version::parse($versionLocalString, false);
+        }
+        $versionLocalString = explode("/", $this->domjudgeVersion)[0];
+        $patch = "/" . substr($this->domjudgeVersion, 0, strrpos($this->domjudgeVersion, '.')) . ".\d/";
+        $minor = "/" . substr($this->domjudgeVersion, 0, strpos($this->domjudgeVersion, '.')) . ".\d.\d/";
+        $major = "/\d.\d.\d/";
+
         $versionUrl = 'https://versions.domjudge.org';
         $options = ['http' => ['method' => 'GET', 'header' => "User-Agent: tarball/" . $versionLocalString . "\r\n"]];
         $context = stream_context_create($options);
         $response = @file_get_contents($versionUrl, false, $context);
-	if ($response === false) {
+        if ($response === false) {
             return false;
         }
         $versions = json_decode($response, true);
-        /* Steer towards to the latest patch first 
+        /* Steer towards to the latest patch first
          * the user can see on the website if there is a new Major/minor themselves
          * otherwise the latest minor, or Major release. So the user might make the upgrade path:
          * DJ6.0.0 -> DJ6.0.6 -> DJ6.6.0 -> DJ9.0.0 instead of
          *         -> DJ6.0.[1..6] -> DJ6.[1..6] -> DJ[7..9].0.0
          */
-        $latestPatchString = $versionLocal;
-        if (isset($versions[$versionLocal->getMajor()][$versionLocal->getMinor()])) {
-            $latestPatchString = Version::rsortString($versions[$versionLocal->getMajor()][$versionLocal->getMinor()])[0];
-            $latestPatch = Version::parse($latestPatchString);
-            if (Version::compare($versionLocal, $latestPatch) < 0) {
-                return $latestPatchString;
-            }
-        }
-        $latestMinorString = $versionLocal;
-        if (isset($versions[$versionLocal->getMajor()])) {
-            $highestMinorInMajor = array_keys($versions[$versionLocal->getMajor()]);
-            rsort($highestMinorInMajor);
-            $latestMinorString = Version::rsortString($versions[$versionLocal->getMajor()][$highestMinorInMajor[0]])[0];
-            $latestMinor = Version::parse($latestMinorString);
-            if (Version::compare($versionLocal, $latestMinor) < 0) {
-                return $latestMinorString;
+        $newer_releases = [];
+        foreach ([$patch, $minor, $major] as $regex) {
+            foreach ($versions as $release) {
+                if (preg_match($regex, $release)) {
+                    $newer_releases[] = $release;
+                }
             }
-        }
-        $latestMajorString = $versionLocal;
-        try {
-            $highestMajor = array_keys($versions);
-            rsort($highestMajor);
-            $highestMinorInMajor = array_keys($versions[$highestMajor[0]]);
-            rsort($highestMinorInMajor);
-            $latestMajorString = Version::rsortString($versions[$highestMajor[0]][$highestMinorInMajor[0]])[0];
-            $latestMajor = Version::parse($latestMajorString);
-            if (Version::compare($versionLocal, $latestMajor) < 0) {
-                return $latestMajorString;
+            if (count($newer_releases) > 0) {
+                natsort($newer_releases);
+                return end($newer_releases);
             }
-        } catch (Exception $e) {
-            return false;
         }
         return false;
     }