Merge branch 'develop'

Merge details: commit 5a6d0c6 Author: Jelle Sebreghts <[email protected]> Date: Fri Mar 10 12:59:54 2023 Fix parse uuid for multisites
district09 · Mar 10, 2023 · 9b95e74 · 9b95e74
2 parents 20df2a2 + 5a6d0c6
commit 9b95e74
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/EventHandler/Drupal8Handler.php b/src/EventHandler/Drupal8Handler.php
@@ -70,15 +70,15 @@ 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');
             if ($uri) {
                 $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
@@ -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
@@ -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
@@ -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.');