From caa47d86621afe8b53488f10e5980605f830868e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 12 Feb 2020 13:51:43 +1100
Subject: [PATCH] Fixes for self-updater (#3313)

* Include Self-Update mailers

* Fixes for self-update
---
 app/Console/Commands/ArtisanUpgrade.php       | 65 +++++++++++++++++++
 config/self-update.php                        |  4 +-
 .../mails/update-available.blade.php          |  5 ++
 .../vendor/self-update/self-update.blade.php  |  0
 4 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 app/Console/Commands/ArtisanUpgrade.php
 create mode 100644 resources/views/vendor/self-update/mails/update-available.blade.php
 create mode 100644 resources/views/vendor/self-update/self-update.blade.php

diff --git a/app/Console/Commands/ArtisanUpgrade.php b/app/Console/Commands/ArtisanUpgrade.php
new file mode 100644
index 000000000000..25494d64032c
--- /dev/null
+++ b/app/Console/Commands/ArtisanUpgrade.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+
+class ArtisanUpgrade extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'ninja:post-update';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Run basic upgrade commands';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+
+        exec("composer install");
+
+        try {
+        
+            Artisan::call('migrate');
+        
+        }catch(Exception $e) {
+
+            \Log::error("I wasn't able to migrate the data.");
+        }
+
+        try {
+        
+            Artisan::call('optimize');
+        
+        }catch(Exception $e) {
+
+            \Log::error("I wasn't able to optimize.");
+        }
+
+
+        \Log::error("finished upgrade post");
+    }
+}
diff --git a/config/self-update.php b/config/self-update.php
index 04d04c54b62f..c8663bcd7a3b 100644
--- a/config/self-update.php
+++ b/config/self-update.php
@@ -120,7 +120,9 @@ return [
 			//]
 		],
 		'post_update' => [
-
+	        'postupdate:cleanup' => [
+            	'class' => \App\Console\Commands\ArtisanUpgrade::class,
+			],
 		],
 	],
 
diff --git a/resources/views/vendor/self-update/mails/update-available.blade.php b/resources/views/vendor/self-update/mails/update-available.blade.php
new file mode 100644
index 000000000000..ffa14dc99591
--- /dev/null
+++ b/resources/views/vendor/self-update/mails/update-available.blade.php
@@ -0,0 +1,5 @@
+Hello!
+
+The new version {{ $newVersion }} is available.
+
+Kind regards
diff --git a/resources/views/vendor/self-update/self-update.blade.php b/resources/views/vendor/self-update/self-update.blade.php
new file mode 100644
index 000000000000..e69de29bb2d1