From 5a6d0c6d970ec92953168b215d488988a1a4f661 Mon Sep 17 00:00:00 2001
From: Jelle Sebreghts <sebreghts.jelle@gmail.com>
Date: Fri, 10 Mar 2023 12:59:54 +0100
Subject: [PATCH] Fix parse uuid for multisites

---
 src/EventHandler/Drupal8Handler.php        | 4 ++--
 src/EventHandler/InstallDrupal8Handler.php | 2 +-
 src/EventHandler/UpdateDrupal8Handler.php  | 2 +-
 src/Traits/Drupal8UtilsTrait.php           | 8 ++------
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/EventHandler/Drupal8Handler.php b/src/EventHandler/Drupal8Handler.php
index a324b69..4be2758 100644
--- a/src/EventHandler/Drupal8Handler.php
+++ b/src/EventHandler/Drupal8Handler.php
@@ -70,7 +70,7 @@ protected function getAccountPassword(string $default = null)
             ->generateString(16);
     }
 
-    protected function addConfigImportTask(CollectionBuilder $collection, array $options, ?string $uri = null)
+    protected function addConfigImportTask(CollectionBuilder $collection, array $options, ?string $uri = null, array $aliases = [])
     {
         if ($options['config-import']) {
             $collection->taskDrushStack('vendor/bin/drush');
@@ -78,7 +78,7 @@ protected function addConfigImportTask(CollectionBuilder $collection, array $opt
                 $collection->uri($uri);
             }
             $collection->drupalRootDirectory($this->getConfig()->get('digipolis.root.web'));
-            $uuid = $this->getSiteUuid($uri);
+            $uuid = $this->getSiteUuid($uri, $aliases);
             if ($uuid) {
                 $collection->drush('cset system.site uuid ' . $uuid);
             }
diff --git a/src/EventHandler/InstallDrupal8Handler.php b/src/EventHandler/InstallDrupal8Handler.php
index cfdf7da..f4c9674 100644
--- a/src/EventHandler/InstallDrupal8Handler.php
+++ b/src/EventHandler/InstallDrupal8Handler.php
@@ -24,7 +24,7 @@ public function handle(GenericEvent $event)
         $collection = $this->collectionBuilder();
         $this->addDropDatabaseRollbackTask($collection, $uri);
         $this->addDrushInstallTask($collection, $options, $aliases, $profile, $uri);
-        $this->addConfigImportTask($collection, $options, $uri);
+        $this->addConfigImportTask($collection, $options, $uri, $aliases);
         $this->addLocaleUpdateTask($collection, $uri);
         $this->addVarnishCheckTask($collection, $uri);
         $this->addDisableMaintenanceModeTask($collection, $uri);
diff --git a/src/EventHandler/UpdateDrupal8Handler.php b/src/EventHandler/UpdateDrupal8Handler.php
index ed6bfc0..f1b5940 100644
--- a/src/EventHandler/UpdateDrupal8Handler.php
+++ b/src/EventHandler/UpdateDrupal8Handler.php
@@ -23,7 +23,7 @@ public function handle(GenericEvent $event)
         $collection = $this->collectionBuilder();
         $this->addEnableMaintenanceModeTask($collection, $uri);
         $this->addDatabaseUpdateTask($collection, $uri);
-        $this->addConfigImportTask($collection, $options, $uri);
+        $this->addConfigImportTask($collection, $options, $uri, $aliases);
         $this->addLocaleUpdateTask($collection, $uri);
         $this->addVarnishCheckTask($collection, $uri);
         $this->addDisableMaintenanceModeTask($collection, $uri);
diff --git a/src/Traits/Drupal8UtilsTrait.php b/src/Traits/Drupal8UtilsTrait.php
index c4f874c..94f53d5 100644
--- a/src/Traits/Drupal8UtilsTrait.php
+++ b/src/Traits/Drupal8UtilsTrait.php
@@ -8,18 +8,14 @@
 
 trait Drupal8UtilsTrait
 {
-    public function getSiteUuid($uri = false)
+    public function getSiteUuid($uri = false, $aliases = [])
     {
+        $aliases ??= [0 => false];
         $webDir = $this->getConfig()->get('digipolis.root.web', false);
         if (!$webDir) {
             $this->say('Could not get site UUID. No webroot found.');
             return false;
         }
-        $roboSettings = $this->getConfig()->get('remote');
-        if (!isset($roboSettings['aliases'])) {
-            $settings['aliases'] = $this->handleEvent('digipolis-drupal8:parse-site-aliases', ['remoteSettings' => null]);
-        }
-        $aliases = $settings['aliases'] ?: [0 => false];
         $finder = new Finder();
         $subdir = ($uri ? '/' . $aliases[$uri] : '');
         $this->say('Searching for settings.php in ' . $webDir . '/sites' . $subdir . ' and subdirectories.');