Merge pull request #57 from helhum/site-settings-overlay

[BUGFIX] Allow overriding site settings from conf vars

Author: helhum

src/Typo3SiteConfiguration.php

@@ -8,6 +8,7 @@
 use Symfony\Component\Yaml\Yaml;
 use TYPO3\CMS\Core\Configuration\SiteConfiguration;
 use TYPO3\CMS\Core\Core\Environment;
+use TYPO3\CMS\Core\Site\Entity\SiteSettings;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class Typo3SiteConfiguration extends SiteConfiguration
@@ -30,6 +31,15 @@ public function load(string $siteIdentifier): array
         return $factory->createRootReader($fileName)->readConfig();
     }
 
+    protected function getSiteSettings(string $siteIdentifier, array $siteConfiguration): SiteSettings
+    {
+        $siteSettings = parent::getSiteSettings($siteIdentifier, $siteConfiguration);
+        if (!isset($siteConfiguration['settings'])) {
+            return $siteSettings;
+        }
+        return new SiteSettings(array_replace_recursive($siteSettings->getAll(), $siteConfiguration['settings']));
+    }
+
     /**
      * Add or update a site configuration
      *