Move internal environment variables to separate config file

Author: mpociot

config/nativephp-internal.php

@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'running' => env('NATIVEPHP_RUNNING', false),
+
+    'storage_path' => env('NATIVEPHP_STORAGE_PATH'),
+
+    'database_path' => env('NATIVEPHP_DATABASE_PATH'),
+
+    'secret' => env('NATIVEPHP_SECRET'),
+];

config/nativephp.php

@@ -1,16 +1,8 @@
 <?php
 
 return [
-    'running' => env('NATIVEPHP_RUNNING', false),
-
-    'storage_path' => env('NATIVEPHP_STORAGE_PATH'),
-
-    'database_path' => env('NATIVEPHP_DATABASE_PATH'),
-
     'version' => env('NATIVEPHP_APP_VERSION', '1.0.0'),
 
-    'secret' => env('NATIVEPHP_SECRET'),
-
     'app_id' => env('NATIVEPHP_APP_ID'),
 
     'deeplink_scheme' => env('NATIVEPHP_DEEPLINK_SCHEME'),

src/Client/Client.php

@@ -16,7 +16,7 @@ public function __construct()
             ->baseUrl(config('nativephp.api_url', ''))
             ->timeout(60 * 60)
             ->withHeaders([
-                'X-NativePHP-Secret' => config('nativephp.secret'),
+                'X-NativePHP-Secret' => config('nativephp-internal.secret'),
             ])
             ->asJson();
     }

src/NativeServiceProvider.php

@@ -35,11 +35,9 @@ public function configurePackage(Package $package): void
 
     public function packageRegistered()
     {
-        foreach ($this->passThrough as $env) {
-            ServeCommand::$passthroughVariables[] = $env;
-        }
+        $this->mergeConfigFrom($this->package->basePath("/../config/nativephp-internal.php"), 'nativephp-internal');
 
-        if (config('nativephp.running')) {
+        if (config('nativephp-internal.running')) {
             $this->configureApp();
         }
     }
@@ -48,22 +46,22 @@ protected function configureApp()
     {
         $oldStoragePath = $this->app->storagePath();
 
-        $this->app->useStoragePath(config('nativephp.storage_path'));
+        $this->app->useStoragePath(config('nativephp-internal.storage_path'));
 
         // Patch all config values that contain the old storage path
         $config = Arr::dot(config()->all());
 
         foreach ($config as $key => $value) {
             if (is_string($value) && str_contains($value, $oldStoragePath)) {
-                $newValue = str_replace($oldStoragePath, config('nativephp.storage_path'), $value);
+                $newValue = str_replace($oldStoragePath, config('nativephp-internal.storage_path'), $value);
                 config([$key => $newValue]);
             }
         }
 
         config(['database.connections.nativephp' => [
             'driver' => 'sqlite',
             'url' => env('DATABASE_URL'),
-            'database' => config('nativephp.database_path'),
+            'database' => config('nativephp-internal.database_path'),
             'prefix' => '',
             'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
         ]]);