Add config defaults support to the localhost site provider

vanilla · Dec 7, 2023 · 8fc1f4d · 8fc1f4d
1 parent 3d30428
commit 8fc1f4d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/src/Local/LocalSite.php b/src/Local/LocalSite.php
@@ -41,6 +41,16 @@ public function __construct(string $configPath, SiteRecord $siteRecord, LocalSit
      */
     protected function loadSiteConfig(): array
     {
+        // Config defaults
+        $configDefaults = $this->siteProvider->loadPhpConfigFile(
+            $this->siteProvider->siteConfigFsBasePath . "/config-defaults.php",
+        );
+
+        $dockerDefaultsPath = $this->siteProvider->siteConfigFsBasePath . "/docker-defaults.php";
+        $dockerDefaults = file_exists($dockerDefaultsPath)
+            ? $this->siteProvider->loadPhpConfigFile($dockerDefaultsPath)
+            : [];
+
         try {
             $clusterConfigPath = "/clusters/" . $this->getClusterID() . ".php";
             $clusterConfig = $this->siteProvider->loadPhpConfigFile($clusterConfigPath);
@@ -50,9 +60,18 @@ protected function loadSiteConfig(): array
 
         $siteConfig = $this->siteProvider->loadPhpConfigFile($this->configPath);
 
-        $config = ArrayUtils::mergeRecursive($clusterConfig, $siteConfig, function ($a, $b) {
-            return $b;
-        });
-        return $config;
+        $configs = [$configDefaults, $dockerDefaults, $clusterConfig, $siteConfig];
+
+        $finalConfig = array_reduce(
+            $configs,
+            function (array $acc, array $new) {
+                return ArrayUtils::mergeRecursive($acc, $new, function ($a, $b) {
+                    return $b;
+                });
+            },
+            [],
+        );
+
+        return $finalConfig;
     }
 }
diff --git a/src/Local/LocalSiteProvider.php b/src/Local/LocalSiteProvider.php
@@ -25,7 +25,7 @@ class LocalSiteProvider extends SiteProvider
     const CONF_ACCOUNT_ID = "Vanilla.AccountID";
     const CONF_SITE_ID = "Vanilla.SiteID";
 
-    private string $siteConfigFsBasePath;
+    public string $siteConfigFsBasePath;
 
     /**
      * @param string $siteConfigFsBasePath

diff --git a/tests/LocalSitesTest.php b/tests/LocalSitesTest.php
@@ -32,6 +32,8 @@ private function expectedSites(): array
         $commonConfig = [
             "Config1" => "val1",
             "Nested.Nested1" => "valnested1",
+            "DefaultConfig" => "foo",
+            "DockerConfig" => "bar",
         ];
         return [
             self::SID_CFG_PHP => new ExpectedSite(

diff --git a/tests/configs/config-defaults.php b/tests/configs/config-defaults.php
@@ -0,0 +1,2 @@
+<?php
+$Configuration["DefaultConfig"] = "foo";
diff --git a/tests/configs/docker-defaults.php b/tests/configs/docker-defaults.php
@@ -0,0 +1,2 @@
+<?php
+$Configuration["DockerConfig"] = "bar";