Simplify update steps

app/Http/Controllers/SetupController.php

@@ -200,8 +200,6 @@ class SetupController extends Controller
         $resource = opendir(database_path('update_scripts'));
         $updateScriptExist = false;
 
-        $tips = [];
-
         while ($filename = @readdir($resource)) {
             if ($filename != '.' && $filename != '..') {
                 preg_match('/update-(.*)-to-(.*).php/', $filename, $matches);
@@ -212,15 +210,7 @@ class SetupController extends Controller
                     continue;
                 }
 
-                $result = require database_path('update_scripts')."/$filename";
-
-                if (is_array($result)) {
-                    // Push the tip into array
-                    foreach ($result as $tip) {
-                        $tips[] = $tip;
-                    }
-                }
-
+                $tips = require database_path('update_scripts')."/$filename";
                 $updateScriptExist = true;
             }
         }
@@ -231,22 +221,9 @@ class SetupController extends Controller
                 Option::set($key, $value);
             }
         }
-
         Option::set('version', config('app.version'));
 
-        // Clear all compiled view files
-        try {
-            Artisan::call('view:clear');
-        } catch (\Exception $e) {
-            Log::error('Error occured when processing view:clear', [$e]);
-
-            $files = collect(File::files(storage_path('framework/views')));
-            $files->reject(function ($path) {
-                return ends_with($path, '.gitignore');
-            })->each(function ($path) {
-                File::delete($path);
-            });
-        }
+        Artisan::call('view:clear');
 
         return view('setup.updates.success', ['tips' => $tips]);
     }

resources/views/setup/updates/success.blade.php

@@ -9,7 +9,7 @@
 <p>@lang('setup.updates.success.text', ['version' => config('app.version')])</p>
 
 {{-- if any tip is given --}}
-@if (!empty($tips))
+@if (is_array($tips))
 <p><b>@lang('setup.updates.success.tips')</b></p>
 <ul>
     @foreach ($tips as $tip)

tests/SetupControllerTest.php

@@ -220,9 +220,6 @@ class SetupControllerTest extends TestCase
             database_path("update_scripts/update-$current_version-to-100.0.0.php")
         );    // Just a fixture
 
-        Artisan::shouldReceive('call')
-            ->with('view:clear')
-            ->andThrow(new Exception());
         config(['options.new_option' => 'value']);
         $this->post('/setup/update')->assertViewHas('tips');
         $this->assertEquals('value', option('new_option'));