From 5d4ea2a308dc221a590941db7147e951b2f45fb6 Mon Sep 17 00:00:00 2001 From: jayvirsinh_gohil Date: Tue, 3 Nov 2020 12:19:51 +0530 Subject: [PATCH] transfer code from update controller to updater class --- app/Http/Controllers/UpdateController.php | 10 ---------- app/Space/Updater.php | 14 +++++++++++++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/UpdateController.php b/app/Http/Controllers/UpdateController.php index df4e397f..2b75d837 100644 --- a/app/Http/Controllers/UpdateController.php +++ b/app/Http/Controllers/UpdateController.php @@ -88,16 +88,6 @@ class UpdateController extends Controller $json = Updater::checkForUpdate(Setting::getSetting('version')); - if ($json->success) { - $extensions = $json->version->extensions; - $data = []; - foreach ($extensions as $extension) { - $data[$extension] = phpversion($extension); - } - $data['php'] = phpversion(); - $json->version->extensions = $data; - } - return response()->json($json); } } diff --git a/app/Space/Updater.php b/app/Space/Updater.php index 536f7534..54e292da 100644 --- a/app/Space/Updater.php +++ b/app/Space/Updater.php @@ -28,7 +28,19 @@ class Updater $data = $response->getBody()->getContents(); } - return json_decode($data); + $data = json_decode($data); + + if ($data->success && $data->version) { + $extensions = $data->version->extensions; + $extensionData = []; + foreach ($extensions as $extension) { + $extensionData[$extension] = phpversion($extension); + } + $extensionData['php'] = phpversion(); + $data->version->extensions = $extensionData; + } + + return $data; } public static function download($new_version)