Extract the funciton

This way we can set the return type

Author: vmcj

webapp/src/Service/DOMJudgeService.php

@@ -74,6 +74,8 @@ class DOMJudgeService
     protected ?Executable $defaultCompareExecutable = null;
     protected ?Executable $defaultRunExecutable = null;
 
+    private string $localVersionString = '';
+
     final public const EVAL_DEFAULT = 0;
     final public const EVAL_LAZY = 1;
     final public const EVAL_FULL = 2;
@@ -1708,6 +1710,25 @@ public function getAllowedLanguagesForContest(?Contest $contest) : array {
             ->getResult();
     }
 
+    /**
+     * @return String[]|false
+     */
+    public function cacher_checkNewVersion(ItemInterface $item): array|false {
+        $item->expiresAfter(86400);
+
+        $versionUrl = 'https://versions.domjudge.org';
+        $options = ['http' => ['timeout' => 1, 'method' => 'GET', 'header' => "User-Agent: DOMjudge#" . $this->domjudgeInstallMethod . "/" . $this->localVersionString . "\r\n"]];
+        $context = stream_context_create($options);
+        $response = @file_get_contents($versionUrl, false, $context);
+        if ($response === false) {
+            return false;
+        }
+        // Assume we get a one-level unordered JSON list with the released versions e.g. ["10.0.0", "9.11.0", "12.0.12", "10.0.1"]
+        $tmp_versions = json_decode($response, true);
+        natsort($tmp_versions);
+        return array_reverse($tmp_versions);
+    }
+
     /**
      * Returns either the next strictly higher version or false when nothing is found/requested.
      */
@@ -1718,29 +1739,19 @@ public function checkNewVersion(): string|false {
         // The local version is something like "x.y.z / commit hash", e.g. "8.4.0DEV/4e25adb13" for development
         // or 8.3.2 for a released version
         // In case of development we remove the commit hash for some anonymity but keep the DEV to not count those as the (possibly) released version
-        $localVersionString = strtok($this->domjudgeVersion, "/");
-        $localVersion = explode(".", $localVersionString);
+        $this->localVersionString = (string)strtok($this->domjudgeVersion, "/");
+        $localVersion = explode(".", $this->localVersionString);
         if (count($localVersion) !== 3) {
             // Unknown version, someone might have locally modified and used their own versioning
             return false;
         }
 
         $cache = new FilesystemAdapter();
-        $versions = $cache->get('domjudge_versions', function (ItemInterface $item, string $localVersionString): string|false {
-            $item->expiresAfter(86400);
-
-            $versionUrl = 'https://versions.domjudge.org';
-            $options = ['http' => ['timeout' => 1, 'method' => 'GET', 'header' => "User-Agent: DOMjudge#" . $this->domjudgeInstallMethod . "/" . $localVersionString . "\r\n"]];
-            $context = stream_context_create($options);
-            $response = @file_get_contents($versionUrl, false, $context);
-            if ($response === false) {
-                return false;
-            }
-            // Assume we get a one-level unordered JSON list with the released versions e.g. ["10.0.0", "9.11.0", "12.0.12", "10.0.1"]
-            $tmp_versions = json_decode($response, true);
-            natsort($tmp_versions);
-            return array_reverse($tmp_versions);
-        });
+        try {
+             $versions = $cache->get('domjudge_versions', [$this, 'cacher_checkNewVersion']);
+        } catch (InvalidArgumentException $e) {
+            return false;
+        }
 
         if (!$versions) {
             return false;