From b9e8db8716f403ec572fd8e45e1b02aa9319f8d9 Mon Sep 17 00:00:00 2001 From: jurgenhaas <juergen@paragon-es.de> Date: Mon, 3 Dec 2018 16:57:34 +0100 Subject: [PATCH] Write some development specific files only outside of CI context --- composer.json | 1 + src/Handler.php | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 284f023..218e23b 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 d3f9e54..3d406db 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)) { -- GitLab