From 8f86e768d0f596392a69ac7150539ccc1957b716 Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Sun, 22 Jul 2018 18:49:41 +0800
Subject: [PATCH] Tweak service providers for code readability

---
 app/Providers/AppServiceProvider.php          | 43 ++++++++++++-------
 app/Providers/RuntimeCheckServiceProvider.php |  9 ++--
 config/app.php                                |  1 -
 3 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 2390473f..e8df2704 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -22,23 +22,14 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        // Replace HTTP_HOST with site url setted in options to prevent CDN source problems
-        if (! option('auto_detect_asset_url')) {
-            $rootUrl = option('site_url');
-
-            if ($this->app['url']->isValidUrl($rootUrl)) {
-                $this->app['url']->forceRootUrl($rootUrl);
-            }
-        }
-
-        if (option('force_ssl') || Utils::isRequestSecure()) {
-            $this->app['url']->forceSchema('https');
-        }
-
+        // Support *.tpl extension name
         View::addExtension('tpl', 'blade');
 
-        Event::listen(Events\RenderingHeader::class, function($event) {
-            // Provide some application information for javascript
+        // Control the URL generated by url() function
+        $this->configureUrlGenerator();
+
+        // Expose some app information to front-end
+        Event::listen(Events\RenderingHeader::class, function ($event) {
             $blessing = array_merge(array_except(config('app'), ['key', 'providers', 'aliases', 'cipher', 'log', 'url']), [
                 'base_url' => url('/'),
                 'site_name' => option_localized('site_name')
@@ -54,6 +45,28 @@ class AppServiceProvider extends ServiceProvider
         }
     }
 
+    /**
+     * Configure the \Illuminate\Routing\UrlGenerator.
+     *
+     * @return void
+     */
+    protected function configureUrlGenerator()
+    {
+        if (! option('auto_detect_asset_url')) {
+            $rootUrl = option('site_url');
+
+            // Replace HTTP_HOST with site_url set in options,
+            // to prevent CDN source problems.
+            if ($this->app['url']->isValidUrl($rootUrl)) {
+                $this->app['url']->forceRootUrl($rootUrl);
+            }
+        }
+
+        if (option('force_ssl') || Utils::isRequestSecure()) {
+            $this->app['url']->forceSchema('https');
+        }
+    }
+
     /**
      * Register any application services.
      *
diff --git a/app/Providers/RuntimeCheckServiceProvider.php b/app/Providers/RuntimeCheckServiceProvider.php
index dfc379d4..90a6cc21 100644
--- a/app/Providers/RuntimeCheckServiceProvider.php
+++ b/app/Providers/RuntimeCheckServiceProvider.php
@@ -24,10 +24,13 @@ class RuntimeCheckServiceProvider extends ServiceProvider
         $this->checkFilePermissions();
         $this->checkDatabaseConnection();
 
-        // Skip the installation check when setup or under CLI
-        if (! $request->is('setup*') && PHP_SAPI != "cli") {
-            $this->checkInstallation();
+        // Skip the installation check on setup wizard or under CLI
+        if ($request->is('setup*') || $this->app->runningInConsole()) {
+            return;
         }
+
+        // Redirect to setup wizard if not installed
+        $this->checkInstallation();
     }
 
     protected function checkFilePermissions()
diff --git a/config/app.php b/config/app.php
index 5f197965..34ea8a3c 100644
--- a/config/app.php
+++ b/config/app.php
@@ -231,7 +231,6 @@ return [
         'Option'    => App\Services\Facades\Option::class,
         'Utils'     => App\Services\Utils::class,
         'Minecraft' => App\Services\Minecraft::class,
-        'Updater'   => App\Services\Updater::class,
     ],
 
 ];