From 2b3105da37b19650966fd836ea33257dd2cbc60e Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Sun, 27 Dec 2020 17:54:29 +0100
Subject: [PATCH] docker/l3d#58 Move project settings out of composer.json
---
src/Handler.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Handler.php b/src/Handler.php
index 23d11aa..5d9e9a3 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -182,11 +182,11 @@ class Handler extends BaseHandler {
// Directory where this plugin is being installed.
$pluginRoot = $installationManager->getInstallPath($this->getPackage('lakedrops/docker4drupal'));
- // If the d8-project-scaffold plugin is present we only execute this one
- // if $force is TRUE. This way we can make sure that we get executed after
- // d8-project-scaffold.
+ // If the d8-project-scaffold or d9-project-scaffold plugin is present we
+ // only execute this one if $force is TRUE. This way we can make sure that
+ // we get executed after d8-project-scaffold or d9-project-scaffold.
$settingsPath = $webRoot . '/sites/default';
- if ($this->getPackage('lakedrops/d8-project-scaffold')) {
+ if ($this->getPackage('lakedrops/d8-project-scaffold') || $this->getPackage('lakedrops/d9-project-scaffold')) {
if (!$fs->exists($projectRoot . '/settings/default')) {
return;
}
--
GitLab