diff --git a/composer.json b/composer.json index 284f0233777305ae59e5ba1cb7e8f2acd200a312..218e23bc184a92597ce9313550944669c1c3d7be 100644 --- a/composer.json +++ b/composer.json @@ -36,6 +36,7 @@ "drupal/coder": "^8.2", "lakedrops/ahoy": "^1.0.0", "lakedrops/behat4drupal": "^1.0.0", + "lakedrops/composer-json-utils": "^1.2.0", "lakedrops/composer-scripts": "^1.1.0", "lakedrops/docker4drupal": "^1.0.0", "lakedrops/dorgflow": "^1.0.0", diff --git a/src/Handler.php b/src/Handler.php index d3f9e54d9f1b0a8fa2e3523ccbcca31a719c45b6..3d406db206ee5767e5009e6e2686b4da4ebcd1bc 100644 --- a/src/Handler.php +++ b/src/Handler.php @@ -97,12 +97,16 @@ class Handler extends BaseHandler { $options['hash'] = str_replace(['+', '/', '='], ['-', '_', ''], base64_encode(random_bytes(55))); $twig_loader = new \Twig_Loader_Array([]); $twig = new \Twig_Environment($twig_loader); - foreach ([ + + $settings_files = [ 'settings.php', 'services.yml', - 'development.services.yml', - 'settings.local.php', - ] as $template) { + ]; + if (!$this->isCiContext()) { + $settings_files[] = 'settings.local.php'; + $settings_files[] = 'development.services.yml'; + } + foreach ($settings_files as $template) { $file = $projectRoot . '/settings/default/' . $template; $link = $webRoot . '/sites/default/' . $template; if (!$fs->exists($link)) {