WIP

grosv · Aug 6, 2020 · 000390d · 000390d
1 parent 5927abc
commit 000390d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/GenerateShiftableConfigsCommand.php b/src/GenerateShiftableConfigsCommand.php
@@ -37,7 +37,7 @@ public function handle(Configurations $configurations)
             }
         }
 
-        File::put(config('shiftable-config.overrides_file'), VarExporter::export($overrides));
+        File::put(config('shiftable-config.overrides_file'), "<?php\n\nreturn " . VarExporter::export($overrides) . ';');
 
         return 0;
     }

diff --git a/src/ShiftableConfigsProvider.php b/src/ShiftableConfigsProvider.php
@@ -2,6 +2,7 @@
 
 namespace Grosv\ShiftableConfigs;
 
+use Illuminate\Contracts\Foundation\CachesConfiguration;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 
@@ -10,7 +11,9 @@ class ShiftableConfigsProvider extends ServiceProvider
     public function boot(Configurations $configurations): void
     {
         $this->mergeConfigFrom(Config::get('shiftable-config.overrides') ?? __DIR__ . '/../config/overrides.php', 'shiftable-config-overrides');
-        $configurations->custom();
+        if (!($this->app instanceof CachesConfiguration && $this->app->configurationIsCached())) {
+            $configurations->custom();
+        }
 
         $this->publishes([
             __DIR__ . '/../config/config.php' => config_path('shiftable-configs.php'),

diff --git a/tests/CommandTest.php b/tests/CommandTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\File;
 
 class CommandTest extends TestCase
@@ -19,5 +20,10 @@ public function can_run_the_command()
             ->assertExitCode(0);
 
         $this->assertStringContainsString('An App By Any Other Name', File::get(__DIR__ . '/configs/overrides.php'));
+
+        $overrides = [];
+        Arr::set($overrides, 'root', include(__DIR__ . '/configs/overrides.php'));
+
+        $this->assertContains('Grosv\ShiftableConfigs\ShiftableConfigsProvider', $overrides['root']['app']['providers']);
     }
 }