cleaner version check

akaunting · Oct 27, 2017 · d92887e · d92887e
1 parent 7638cea
commit d92887e
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/app/Utilities/Versions.php b/app/Utilities/Versions.php
@@ -97,20 +97,25 @@ public static function latest($modules = array())
 
     public static function getLatestVersion($url)
     {
+        $latest = '0.0.0';
+
         $response = static::getRemote($url, ['timeout' => 30, 'referer' => true]);
 
-        if ($response->getStatusCode() == 200) {
-            $version = json_decode($response->getBody())->data;
+        // Bad response
+        if ($response->getStatusCode() != 200) {
+            return $latest;
+        }
 
-            if (is_object($version)) {
-                $latest = $version->latest;
-            } else {
-                $latest = '0.0.0';
-            }
-        } else {
-            $latest = '0.0.0';
+        $content = json_decode($response->getBody());
+
+        // Empty response
+        if (!is_object($content) || !is_object($content->data)) {
+            return $latest;
         }
 
+        // Get the latest version
+        $latest = $content->data->latest;
+
         return $latest;
     }
 }