From 20e4ae5ff8d5775fde7138ed24f48c0e752a3b41 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Tue, 24 May 2016 17:00:48 +0100
Subject: [PATCH] Scaled things back

---
 .../Providers/ConfigServiceProvider.php       | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/app/Foundation/Providers/ConfigServiceProvider.php b/app/Foundation/Providers/ConfigServiceProvider.php
index 5351929a..b7665ab7 100644
--- a/app/Foundation/Providers/ConfigServiceProvider.php
+++ b/app/Foundation/Providers/ConfigServiceProvider.php
@@ -14,8 +14,6 @@ namespace CachetHQ\Cachet\Foundation\Providers;
 use CachetHQ\Cachet\Config\Repository;
 use CachetHQ\Cachet\Models\Setting as SettingModel;
 use Exception;
-use Illuminate\Contracts\Console\Kernel;
-use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 
 /**
@@ -34,26 +32,26 @@ class ConfigServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        if ($this->app->configurationIsCached()) {
-            if ($this->app->environment() === 'production') {
-                $this->app->terminating(function () {
-                    if ($this->app->setting->stale()) {
-                        $this->app->make(Kernel::class)->call('config:cache');
-                    }
-                });
-            } else {
-                $this->app->make(Kernel::class)->call('config:clear');
-            }
+        $path = $this->app->bootstrapPath().'/cache/cachet.'.$this->app->environment().'.php';
 
-            return;
+        try {
+            $cache = $this->app->files->getRequire($path);
+        } catch (Exception $e) {
+            $cache = false;
         }
 
+        $this->app->terminating(function () use ($path) {
+            if ($this->app->setting->stale()) {
+                $this->app->files->put($path, '<?php return '.var_export($this->app->setting->all(), true).';'.PHP_EOL);
+            }
+        });
+
         try {
             // Get the default settings.
             $defaultSettings = $this->app->config->get('setting');
 
             // Get the configured settings.
-            $appSettings = $this->app->setting->all();
+            $appSettings = $cache === false ? $this->app->setting->all() : $cache;
 
             // Merge the settings
             $settings = array_merge($defaultSettings, $appSettings);
@@ -88,12 +86,6 @@ class ConfigServiceProvider extends ServiceProvider
         }
 
         $this->app->config->set('cors.paths.api/v1/*.allowedOrigins', $allowedOrigins);
-
-        if ($this->app->environment() === 'production') {
-            $this->app->terminating(function () {
-                $this->app->make(Kernel::class)->call('config:cache');
-            });
-        }
     }
 
     /**