From d647e80340ca29faabad19dd5ebbc7122aeb03d7 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Thu, 3 Sep 2026 15:00:27 +1000
Subject: [PATCH 1/5] [#3081] Derived the host with 'parse_url()' when building
 trusted host patterns.

---
 tests/phpunit/Drupal/EnvironmentSettingsTest.php          | 8 ++++----
 .../default/includes/providers/settings.container.php     | 5 ++++-
 web/sites/default/includes/providers/settings.lagoon.php  | 5 ++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 038b308ad..0c9a4f3c6 100644
--- a/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1142,7 +1142,7 @@ public function testEnvironmentLagoonPreview(): void {
       '^nginx\-php$',
       '^.+\.amazee\.io$',
       '^example1\.com$',
-      '^example2\/com$',
+      '^example2$',
     ];
     $this->assertSettings($settings);
   }
@@ -1211,7 +1211,7 @@ public function testEnvironmentLagoonDev(): void {
       '^nginx\-php$',
       '^.+\.amazee\.io$',
       '^example1\.com$',
-      '^example2\/com$',
+      '^example2$',
     ];
     $this->assertSettings($settings);
   }
@@ -1280,7 +1280,7 @@ public function testEnvironmentLagoonTest(): void {
       '^nginx\-php$',
       '^.+\.amazee\.io$',
       '^example1\.com$',
-      '^example2\/com$',
+      '^example2$',
     ];
     $this->assertSettings($settings);
   }
@@ -1347,7 +1347,7 @@ public function testEnvironmentLagoonProd(): void {
       '^nginx\-php$',
       '^.+\.amazee\.io$',
       '^example1\.com$',
-      '^example2\/com$',
+      '^example2$',
     ];
     $this->assertSettings($settings);
   }
diff --git a/web/sites/default/includes/providers/settings.container.php b/web/sites/default/includes/providers/settings.container.php
index 66c80c77f..b58edc0ca 100644
--- a/web/sites/default/includes/providers/settings.container.php
+++ b/web/sites/default/includes/providers/settings.container.php
@@ -16,7 +16,10 @@
 if (!empty($container_localdev_url)) {
   $container_urls = array_map(trim(...), explode(',', $container_localdev_url));
   foreach ($container_urls as $container_url) {
-    $container_host = strtolower(str_replace(['https://', 'http://'], '', $container_url));
+    // parse_url() reads a scheme-less value as a path, so re-parse with '//'
+    // prepended to yield the host.
+    $container_host = parse_url($container_url, PHP_URL_HOST) ?: parse_url('//' . $container_url, PHP_URL_HOST);
+    $container_host = strtolower((string) $container_host);
     if (!empty($container_host)) {
       $settings['trusted_host_patterns'][] = '^' . preg_quote($container_host, '/') . '$';
     }
diff --git a/web/sites/default/includes/providers/settings.lagoon.php b/web/sites/default/includes/providers/settings.lagoon.php
index e849ef10a..48af01864 100644
--- a/web/sites/default/includes/providers/settings.lagoon.php
+++ b/web/sites/default/includes/providers/settings.lagoon.php
@@ -58,7 +58,10 @@
   if ($lagoon_routes) {
     $lagoon_route_urls = array_map(trim(...), explode(',', $lagoon_routes));
     foreach ($lagoon_route_urls as $lagoon_route_url) {
-      $lagoon_route_host = strtolower(str_replace(['https://', 'http://'], '', $lagoon_route_url));
+      // parse_url() reads a scheme-less value as a path, so re-parse with '//'
+      // prepended to yield the host.
+      $lagoon_route_host = parse_url($lagoon_route_url, PHP_URL_HOST) ?: parse_url('//' . $lagoon_route_url, PHP_URL_HOST);
+      $lagoon_route_host = strtolower((string) $lagoon_route_host);
       if (!empty($lagoon_route_host)) {
         $settings['trusted_host_patterns'][] = '^' . preg_quote($lagoon_route_host, '/') . '$';
       }

From a329fbbc3559fd7c129a279d02dc33086fe9b79e Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Thu, 3 Sep 2026 15:04:15 +1000
Subject: [PATCH 2/5] Updated snapshots.

---
 .../default/includes/providers/settings.container.php     | 5 ++++-
 .../default/includes/providers/settings.container.php     | 5 ++++-
 .../tests/phpunit/Drupal/EnvironmentSettingsTest.php      | 8 ++++----
 .../sites/default/includes/providers/settings.lagoon.php  | 5 ++++-
 .../default/includes/providers/settings.container.php     | 5 ++++-
 .../tests/phpunit/Drupal/EnvironmentSettingsTest.php      | 8 ++++----
 .../sites/default/includes/providers/settings.lagoon.php  | 5 ++++-
 .../tests/phpunit/Drupal/EnvironmentSettingsTest.php      | 8 ++++----
 .../sites/default/includes/providers/settings.lagoon.php  | 5 ++++-
 .../tests/phpunit/Drupal/EnvironmentSettingsTest.php      | 8 ++++----
 .../sites/default/includes/providers/settings.lagoon.php  | 5 ++++-
 .../tests/phpunit/Drupal/EnvironmentSettingsTest.php      | 8 ++++----
 .../sites/default/includes/providers/settings.lagoon.php  | 5 ++++-
 13 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/web/sites/default/includes/providers/settings.container.php b/.vortex/installer/tests/Fixtures/handler_process/_baseline/web/sites/default/includes/providers/settings.container.php
index 66c80c77f..b58edc0ca 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/web/sites/default/includes/providers/settings.container.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/web/sites/default/includes/providers/settings.container.php
@@ -16,7 +16,10 @@
 if (!empty($container_localdev_url)) {
   $container_urls = array_map(trim(...), explode(',', $container_localdev_url));
   foreach ($container_urls as $container_url) {
-    $container_host = strtolower(str_replace(['https://', 'http://'], '', $container_url));
+    // parse_url() reads a scheme-less value as a path, so re-parse with '//'
+    // prepended to yield the host.
+    $container_host = parse_url($container_url, PHP_URL_HOST) ?: parse_url('//' . $container_url, PHP_URL_HOST);
+    $container_host = strtolower((string) $container_host);
     if (!empty($container_host)) {
       $settings['trusted_host_patterns'][] = '^' . preg_quote($container_host, '/') . '$';
     }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/docroot/sites/default/includes/providers/settings.container.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/docroot/sites/default/includes/providers/settings.container.php
index 66c80c77f..b58edc0ca 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/docroot/sites/default/includes/providers/settings.container.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/docroot/sites/default/includes/providers/settings.container.php
@@ -16,7 +16,10 @@
 if (!empty($container_localdev_url)) {
   $container_urls = array_map(trim(...), explode(',', $container_localdev_url));
   foreach ($container_urls as $container_url) {
-    $container_host = strtolower(str_replace(['https://', 'http://'], '', $container_url));
+    // parse_url() reads a scheme-less value as a path, so re-parse with '//'
+    // prepended to yield the host.
+    $container_host = parse_url($container_url, PHP_URL_HOST) ?: parse_url('//' . $container_url, PHP_URL_HOST);
+    $container_host = strtolower((string) $container_host);
     if (!empty($container_host)) {
       $settings['trusted_host_patterns'][] = '^' . preg_quote($container_host, '/') . '$';
     }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 2f2a97d16..1b339da51 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -251,7 +251,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -314,7 +314,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -377,7 +377,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -438,7 +438,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
      ];
      $this->assertSettings($settings);
    }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/web/sites/default/includes/providers/settings.lagoon.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/web/sites/default/includes/providers/settings.lagoon.php
index e849ef10a..48af01864 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/web/sites/default/includes/providers/settings.lagoon.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/web/sites/default/includes/providers/settings.lagoon.php
@@ -58,7 +58,10 @@
   if ($lagoon_routes) {
     $lagoon_route_urls = array_map(trim(...), explode(',', $lagoon_routes));
     foreach ($lagoon_route_urls as $lagoon_route_url) {
-      $lagoon_route_host = strtolower(str_replace(['https://', 'http://'], '', $lagoon_route_url));
+      // parse_url() reads a scheme-less value as a path, so re-parse with '//'
+      // prepended to yield the host.
+      $lagoon_route_host = parse_url($lagoon_route_url, PHP_URL_HOST) ?: parse_url('//' . $lagoon_route_url, PHP_URL_HOST);
+      $lagoon_route_host = strtolower((string) $lagoon_route_host);
       if (!empty($lagoon_route_host)) {
         $settings['trusted_host_patterns'][] = '^' . preg_quote($lagoon_route_host, '/') . '$';
       }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/docroot/sites/default/includes/providers/settings.container.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/docroot/sites/default/includes/providers/settings.container.php
index 66c80c77f..b58edc0ca 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/docroot/sites/default/includes/providers/settings.container.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/docroot/sites/default/includes/providers/settings.container.php
@@ -16,7 +16,10 @@
 if (!empty($container_localdev_url)) {
   $container_urls = array_map(trim(...), explode(',', $container_localdev_url));
   foreach ($container_urls as $container_url) {
-    $container_host = strtolower(str_replace(['https://', 'http://'], '', $container_url));
+    // parse_url() reads a scheme-less value as a path, so re-parse with '//'
+    // prepended to yield the host.
+    $container_host = parse_url($container_url, PHP_URL_HOST) ?: parse_url('//' . $container_url, PHP_URL_HOST);
+    $container_host = strtolower((string) $container_host);
     if (!empty($container_host)) {
       $settings['trusted_host_patterns'][] = '^' . preg_quote($container_host, '/') . '$';
     }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 2f2a97d16..1b339da51 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -251,7 +251,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -314,7 +314,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -377,7 +377,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -438,7 +438,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
      ];
      $this->assertSettings($settings);
    }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/web/sites/default/includes/providers/settings.lagoon.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/web/sites/default/includes/providers/settings.lagoon.php
index e849ef10a..48af01864 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/web/sites/default/includes/providers/settings.lagoon.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/web/sites/default/includes/providers/settings.lagoon.php
@@ -58,7 +58,10 @@
   if ($lagoon_routes) {
     $lagoon_route_urls = array_map(trim(...), explode(',', $lagoon_routes));
     foreach ($lagoon_route_urls as $lagoon_route_url) {
-      $lagoon_route_host = strtolower(str_replace(['https://', 'http://'], '', $lagoon_route_url));
+      // parse_url() reads a scheme-less value as a path, so re-parse with '//'
+      // prepended to yield the host.
+      $lagoon_route_host = parse_url($lagoon_route_url, PHP_URL_HOST) ?: parse_url('//' . $lagoon_route_url, PHP_URL_HOST);
+      $lagoon_route_host = strtolower((string) $lagoon_route_host);
       if (!empty($lagoon_route_host)) {
         $settings['trusted_host_patterns'][] = '^' . preg_quote($lagoon_route_host, '/') . '$';
       }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 2f2a97d16..1b339da51 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -251,7 +251,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -314,7 +314,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -377,7 +377,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -438,7 +438,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
      ];
      $this->assertSettings($settings);
    }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/web/sites/default/includes/providers/settings.lagoon.php b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/web/sites/default/includes/providers/settings.lagoon.php
index e849ef10a..48af01864 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/web/sites/default/includes/providers/settings.lagoon.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/web/sites/default/includes/providers/settings.lagoon.php
@@ -58,7 +58,10 @@
   if ($lagoon_routes) {
     $lagoon_route_urls = array_map(trim(...), explode(',', $lagoon_routes));
     foreach ($lagoon_route_urls as $lagoon_route_url) {
-      $lagoon_route_host = strtolower(str_replace(['https://', 'http://'], '', $lagoon_route_url));
+      // parse_url() reads a scheme-less value as a path, so re-parse with '//'
+      // prepended to yield the host.
+      $lagoon_route_host = parse_url($lagoon_route_url, PHP_URL_HOST) ?: parse_url('//' . $lagoon_route_url, PHP_URL_HOST);
+      $lagoon_route_host = strtolower((string) $lagoon_route_host);
       if (!empty($lagoon_route_host)) {
         $settings['trusted_host_patterns'][] = '^' . preg_quote($lagoon_route_host, '/') . '$';
       }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 17ae6f0aa..27b405977 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -265,7 +265,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -328,7 +328,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -391,7 +391,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -452,7 +452,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
      ];
      $this->assertSettings($settings);
    }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/web/sites/default/includes/providers/settings.lagoon.php b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/web/sites/default/includes/providers/settings.lagoon.php
index e849ef10a..48af01864 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/web/sites/default/includes/providers/settings.lagoon.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/web/sites/default/includes/providers/settings.lagoon.php
@@ -58,7 +58,10 @@
   if ($lagoon_routes) {
     $lagoon_route_urls = array_map(trim(...), explode(',', $lagoon_routes));
     foreach ($lagoon_route_urls as $lagoon_route_url) {
-      $lagoon_route_host = strtolower(str_replace(['https://', 'http://'], '', $lagoon_route_url));
+      // parse_url() reads a scheme-less value as a path, so re-parse with '//'
+      // prepended to yield the host.
+      $lagoon_route_host = parse_url($lagoon_route_url, PHP_URL_HOST) ?: parse_url('//' . $lagoon_route_url, PHP_URL_HOST);
+      $lagoon_route_host = strtolower((string) $lagoon_route_host);
       if (!empty($lagoon_route_host)) {
         $settings['trusted_host_patterns'][] = '^' . preg_quote($lagoon_route_host, '/') . '$';
       }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 2f2a97d16..1b339da51 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -251,7 +251,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -314,7 +314,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -377,7 +377,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
 +    ];
 +    $this->assertSettings($settings);
 +  }
@@ -438,7 +438,7 @@
 +      '^nginx\-php$',
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
-+      '^example2\/com$',
++      '^example2$',
      ];
      $this->assertSettings($settings);
    }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/web/sites/default/includes/providers/settings.lagoon.php b/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/web/sites/default/includes/providers/settings.lagoon.php
index e849ef10a..48af01864 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/web/sites/default/includes/providers/settings.lagoon.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/web/sites/default/includes/providers/settings.lagoon.php
@@ -58,7 +58,10 @@
   if ($lagoon_routes) {
     $lagoon_route_urls = array_map(trim(...), explode(',', $lagoon_routes));
     foreach ($lagoon_route_urls as $lagoon_route_url) {
-      $lagoon_route_host = strtolower(str_replace(['https://', 'http://'], '', $lagoon_route_url));
+      // parse_url() reads a scheme-less value as a path, so re-parse with '//'
+      // prepended to yield the host.
+      $lagoon_route_host = parse_url($lagoon_route_url, PHP_URL_HOST) ?: parse_url('//' . $lagoon_route_url, PHP_URL_HOST);
+      $lagoon_route_host = strtolower((string) $lagoon_route_host);
       if (!empty($lagoon_route_host)) {
         $settings['trusted_host_patterns'][] = '^' . preg_quote($lagoon_route_host, '/') . '$';
       }

From 55e026b7b4ad1fb846ad0b1941d28db19d64db6c Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Thu, 3 Sep 2026 15:38:20 +1000
Subject: [PATCH 3/5] Addressed code review: added trusted host pattern
 coverage for scheme-less provider URLs.

---
 .../Drupal/EnvironmentSettingsTest.php        | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 0c9a4f3c6..3c1a3c4c6 100644
--- a/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -588,6 +588,26 @@ public function testEnvironmentLocalContainerMultipleUrls(): void {
       ],
     ]);
   }
+
+  /**
+   * Test trusted host patterns for container provider URLs without a scheme.
+   */
+  public function testEnvironmentLocalContainerSchemelessUrls(): void {
+    $this->setEnvVars([
+      'LOCALDEV_URL' => 'Example-Site.docker.amazee.io:8080 , second-site.docker.amazee.io/subpath',
+    ]);
+
+    $this->requireSettingsFile();
+
+    $this->assertSettingsContains([
+      'trusted_host_patterns' => [
+        '^localhost$',
+        '^example\-site\.docker\.amazee\.io$',
+        '^second\-site\.docker\.amazee\.io$',
+        '^nginx$',
+      ],
+    ]);
+  }
   // phpcs:ignore #;> SETTINGS_PROVIDER_CONTAINER
 
   // phpcs:ignore #;< SETTINGS_PROVIDER_CIRCLECI
@@ -1351,6 +1371,29 @@ public function testEnvironmentLagoonProd(): void {
     ];
     $this->assertSettings($settings);
   }
+
+  /**
+   * Test trusted host patterns for Lagoon routes without a scheme.
+   */
+  public function testEnvironmentLagoonSchemelessRoutes(): void {
+    $this->setEnvVars([
+      'LAGOON_KUBERNETES' => 1,
+      'LAGOON_ENVIRONMENT_TYPE' => 'development',
+      'LAGOON_ROUTES' => 'Example1.com:8443 , example2.com/subpath',
+    ]);
+
+    $this->requireSettingsFile();
+
+    $this->assertSettingsContains([
+      'trusted_host_patterns' => [
+        '^localhost$',
+        '^nginx\-php$',
+        '^.+\.amazee\.io$',
+        '^example1\.com$',
+        '^example2\.com$',
+      ],
+    ]);
+  }
   // phpcs:ignore #;> SETTINGS_PROVIDER_LAGOON
 
 }

From 4f7a4b689ab0563d28af4d802e79cea05582beb8 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Thu, 3 Sep 2026 15:38:31 +1000
Subject: [PATCH 4/5] Updated snapshots.

---
 .../Drupal/EnvironmentSettingsTest.php        | 20 ++++++++++
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        | 37 +++++++++++++++----
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        | 37 +++++++++++++++----
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        | 37 +++++++++++++++----
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        | 37 +++++++++++++++----
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  4 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        | 37 +++++++++++++++----
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 .../Drupal/EnvironmentSettingsTest.php        |  2 +-
 46 files changed, 211 insertions(+), 76 deletions(-)

diff --git a/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index ca8f3d708..e7efbff6b 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/_baseline/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -327,6 +327,26 @@ public function testEnvironmentLocalContainerMultipleUrls(): void {
     ]);
   }
 
+  /**
+   * Test trusted host patterns for container provider URLs without a scheme.
+   */
+  public function testEnvironmentLocalContainerSchemelessUrls(): void {
+    $this->setEnvVars([
+      'LOCALDEV_URL' => 'Example-Site.docker.amazee.io:8080 , second-site.docker.amazee.io/subpath',
+    ]);
+
+    $this->requireSettingsFile();
+
+    $this->assertSettingsContains([
+      'trusted_host_patterns' => [
+        '^localhost$',
+        '^example\-site\.docker\.amazee\.io$',
+        '^second\-site\.docker\.amazee\.io$',
+        '^nginx$',
+      ],
+    ]);
+  }
+
   /**
    * Test per-environment settings for GitHub Actions.
    */
diff --git a/.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/ciprovider_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/code_coverage_provider_codecov_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/code_coverage_provider_codecov_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/code_coverage_provider_codecov_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/code_coverage_provider_codecov_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/deploy_types_all_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/deploy_types_all_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/deploy_types_all_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/deploy_types_all_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/deploy_types_none_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/deps_updates_provider_ci_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index da3f7f9f9..c4bcdb8a0 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -49,7 +49,7 @@
    }
  
    /**
-@@ -378,6 +422,325 @@
+@@ -398,6 +442,325 @@
      $settings['maintenance_theme'] = 'claro';
      $settings['skip_permissions_hardening'] = TRUE;
      $settings['config_sync_directory'] = '../config/default';
diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 1b339da51..031206906 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -185,12 +185,10 @@
    }
  
    /**
-@@ -380,6 +560,256 @@
-     $settings['config_sync_directory'] = '../config/default';
-     $settings['trusted_host_patterns'] = [
+@@ -402,6 +582,279 @@
        '^localhost$',
-+    ];
-+    $this->assertSettings($settings);
+     ];
+     $this->assertSettings($settings);
 +  }
 +
 +  /**
@@ -439,6 +437,31 @@
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
 +      '^example2$',
-     ];
-     $this->assertSettings($settings);
++    ];
++    $this->assertSettings($settings);
++  }
++
++  /**
++   * Test trusted host patterns for Lagoon routes without a scheme.
++   */
++  public function testEnvironmentLagoonSchemelessRoutes(): void {
++    $this->setEnvVars([
++      'LAGOON_KUBERNETES' => 1,
++      'LAGOON_ENVIRONMENT_TYPE' => 'development',
++      'LAGOON_ROUTES' => 'Example1.com:8443 , example2.com/subpath',
++    ]);
++
++    $this->requireSettingsFile();
++
++    $this->assertSettingsContains([
++      'trusted_host_patterns' => [
++        '^localhost$',
++        '^nginx\-php$',
++        '^.+\.amazee\.io$',
++        '^example1\.com$',
++        '^example2\.com$',
++      ],
++    ]);
    }
+ 
+ }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index da3f7f9f9..c4bcdb8a0 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -49,7 +49,7 @@
    }
  
    /**
-@@ -378,6 +422,325 @@
+@@ -398,6 +442,325 @@
      $settings['maintenance_theme'] = 'claro';
      $settings['skip_permissions_hardening'] = TRUE;
      $settings['config_sync_directory'] = '../config/default';
diff --git a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 1b339da51..031206906 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/hosting_project_name___lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -185,12 +185,10 @@
    }
  
    /**
-@@ -380,6 +560,256 @@
-     $settings['config_sync_directory'] = '../config/default';
-     $settings['trusted_host_patterns'] = [
+@@ -402,6 +582,279 @@
        '^localhost$',
-+    ];
-+    $this->assertSettings($settings);
+     ];
+     $this->assertSettings($settings);
 +  }
 +
 +  /**
@@ -439,6 +437,31 @@
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
 +      '^example2$',
-     ];
-     $this->assertSettings($settings);
++    ];
++    $this->assertSettings($settings);
++  }
++
++  /**
++   * Test trusted host patterns for Lagoon routes without a scheme.
++   */
++  public function testEnvironmentLagoonSchemelessRoutes(): void {
++    $this->setEnvVars([
++      'LAGOON_KUBERNETES' => 1,
++      'LAGOON_ENVIRONMENT_TYPE' => 'development',
++      'LAGOON_ROUTES' => 'Example1.com:8443 , example2.com/subpath',
++    ]);
++
++    $this->requireSettingsFile();
++
++    $this->assertSettingsContains([
++      'trusted_host_patterns' => [
++        '^localhost$',
++        '^nginx\-php$',
++        '^.+\.amazee\.io$',
++        '^example1\.com$',
++        '^example2\.com$',
++      ],
++    ]);
    }
+ 
+ }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 1b339da51..031206906 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/migration_disabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -185,12 +185,10 @@
    }
  
    /**
-@@ -380,6 +560,256 @@
-     $settings['config_sync_directory'] = '../config/default';
-     $settings['trusted_host_patterns'] = [
+@@ -402,6 +582,279 @@
        '^localhost$',
-+    ];
-+    $this->assertSettings($settings);
+     ];
+     $this->assertSettings($settings);
 +  }
 +
 +  /**
@@ -439,6 +437,31 @@
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
 +      '^example2$',
-     ];
-     $this->assertSettings($settings);
++    ];
++    $this->assertSettings($settings);
++  }
++
++  /**
++   * Test trusted host patterns for Lagoon routes without a scheme.
++   */
++  public function testEnvironmentLagoonSchemelessRoutes(): void {
++    $this->setEnvVars([
++      'LAGOON_KUBERNETES' => 1,
++      'LAGOON_ENVIRONMENT_TYPE' => 'development',
++      'LAGOON_ROUTES' => 'Example1.com:8443 , example2.com/subpath',
++    ]);
++
++    $this->requireSettingsFile();
++
++    $this->assertSettingsContains([
++      'trusted_host_patterns' => [
++        '^localhost$',
++        '^nginx\-php$',
++        '^.+\.amazee\.io$',
++        '^example1\.com$',
++        '^example2\.com$',
++      ],
++    ]);
    }
+ 
+ }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 299904655..4f08f8336 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -12,7 +12,7 @@
      $this->assertEquals($databases, $this->databases);
  
      // Verify key config overrides.
-@@ -328,9 +335,9 @@
+@@ -348,9 +355,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 27b405977..7b61da995 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/migration_enabled_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -199,12 +199,10 @@
      $this->assertEquals($databases, $this->databases);
  
      // Verify key config overrides.
-@@ -380,6 +567,256 @@
-     $settings['config_sync_directory'] = '../config/default';
-     $settings['trusted_host_patterns'] = [
+@@ -402,6 +589,279 @@
        '^localhost$',
-+    ];
-+    $this->assertSettings($settings);
+     ];
+     $this->assertSettings($settings);
 +  }
 +
 +  /**
@@ -453,6 +451,31 @@
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
 +      '^example2$',
-     ];
-     $this->assertSettings($settings);
++    ];
++    $this->assertSettings($settings);
++  }
++
++  /**
++   * Test trusted host patterns for Lagoon routes without a scheme.
++   */
++  public function testEnvironmentLagoonSchemelessRoutes(): void {
++    $this->setEnvVars([
++      'LAGOON_KUBERNETES' => 1,
++      'LAGOON_ENVIRONMENT_TYPE' => 'development',
++      'LAGOON_ROUTES' => 'Example1.com:8443 , example2.com/subpath',
++    ]);
++
++    $this->requireSettingsFile();
++
++    $this->assertSettingsContains([
++      'trusted_host_patterns' => [
++        '^localhost$',
++        '^nginx\-php$',
++        '^.+\.amazee\.io$',
++        '^example1\.com$',
++        '^example2\.com$',
++      ],
++    ]);
    }
+ 
+ }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 555c854e8..0001d8a6a 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_config_split/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -14,7 +14,7 @@
      $config['environment_indicator.indicator']['bg_color'] = '#006600';
      $config['environment_indicator.indicator']['fg_color'] = '#ffffff';
      $config['environment_indicator.indicator']['name'] = self::ENVIRONMENT_LOCAL;
-@@ -338,7 +336,6 @@
+@@ -358,7 +356,6 @@
      $this->requireSettingsFile();
  
      $config['automated_cron.settings']['interval'] = 0;
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index b8b8fce5a..2b07faf38 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -30,7 +30,7 @@
        'generated_content',
        'testmode',
      ];
-@@ -360,7 +356,6 @@
+@@ -380,7 +376,6 @@
  
      $settings['auto_create_htaccess'] = FALSE;
      $settings['config_exclude_modules'] = [
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index b8b8fce5a..2b07faf38 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -30,7 +30,7 @@
        'generated_content',
        'testmode',
      ];
-@@ -360,7 +356,6 @@
+@@ -380,7 +376,6 @@
  
      $settings['auto_create_htaccess'] = FALSE;
      $settings['config_exclude_modules'] = [
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index a71141c69..748b69a58 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -34,7 +34,7 @@
        'testmode',
      ];
      $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
-@@ -360,8 +352,6 @@
+@@ -380,8 +372,6 @@
  
      $settings['auto_create_htaccess'] = FALSE;
      $settings['config_exclude_modules'] = [
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 9155ca543..8266f390b 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_devel_sdc_devel_generated_content_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -38,7 +38,7 @@
      ];
      $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
      $settings['entity_update_batch_size'] = 50;
-@@ -360,9 +348,6 @@
+@@ -380,9 +368,6 @@
  
      $settings['auto_create_htaccess'] = FALSE;
      $settings['config_exclude_modules'] = [
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 09026566f..4bc1b7fec 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_environment_indicator/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -46,7 +46,7 @@
      $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /";
      $config['shield.settings']['shield_enable'] = FALSE;
      $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE;
-@@ -339,11 +319,6 @@
+@@ -359,11 +339,6 @@
  
      $config['automated_cron.settings']['interval'] = 0;
      $config['config_split.config_split.ci']['status'] = TRUE;
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 0bec03a6a..cfabe5cc4 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_generated_content/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -30,7 +30,7 @@
        'testmode',
      ];
      $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
-@@ -361,7 +357,6 @@
+@@ -381,7 +377,6 @@
      $settings['auto_create_htaccess'] = FALSE;
      $settings['config_exclude_modules'] = [
        'devel',
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 85e749586..8d62d2805 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_reroute_email/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -38,7 +38,7 @@
      $config['seckit.settings']['seckit_xss']['csp']['checkbox'] = FALSE;
      $config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE;
      $this->assertConfig($config);
-@@ -351,9 +339,6 @@
+@@ -371,9 +359,6 @@
      $config['system.logging']['error_level'] = 'all';
      $config['system.mail']['interface']['default'] = 'test_mail_collector';
      $config['system.performance']['cache']['page']['max_age'] = 900;
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 670feedc6..310cf6c5f 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_robotstxt/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -30,7 +30,7 @@
      $config['shield.settings']['shield_enable'] = FALSE;
      $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE;
      $config['xmlsitemap_engines.settings']['submit'] = FALSE;
-@@ -344,7 +340,6 @@
+@@ -364,7 +360,6 @@
      $config['environment_indicator.indicator']['name'] = self::ENVIRONMENT_CI;
      $config['environment_indicator.settings']['favicon'] = TRUE;
      $config['environment_indicator.settings']['toolbar_integration'] = [TRUE];
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index ae4bedfc6..d174cfdd4 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -16,7 +16,7 @@
      $this->assertConfig($config);
  
      $settings['auto_create_htaccess'] = FALSE;
-@@ -354,8 +350,6 @@
+@@ -374,8 +370,6 @@
      $config['reroute_email.settings']['enable'] = FALSE;
      $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com';
      $config['reroute_email.settings']['allowed'] = '*@star-wars.com';
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 59c691e69..eb4468ee8 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_seckit_shield_stage_file_proxy/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -48,7 +48,7 @@
      $this->assertConfig($config);
  
      $settings['auto_create_htaccess'] = FALSE;
-@@ -345,7 +337,6 @@
+@@ -365,7 +357,6 @@
      $config['environment_indicator.settings']['favicon'] = TRUE;
      $config['environment_indicator.settings']['toolbar_integration'] = [TRUE];
      $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /";
@@ -56,7 +56,7 @@
      $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE;
      $config['xmlsitemap_engines.settings']['submit'] = FALSE;
      $config['system.logging']['error_level'] = 'all';
-@@ -354,8 +345,6 @@
+@@ -374,8 +365,6 @@
      $config['reroute_email.settings']['enable'] = FALSE;
      $config['reroute_email.settings']['address'] = 'webmaster@star-wars.com';
      $config['reroute_email.settings']['allowed'] = '*@star-wars.com';
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 754d27d27..b6ff39ff7 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_shield/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -30,7 +30,7 @@
      $config['xmlsitemap.settings']['disable_cron_regeneration'] = TRUE;
      $config['xmlsitemap_engines.settings']['submit'] = FALSE;
      $config['system.logging']['error_level'] = 'all';
-@@ -345,7 +341,6 @@
+@@ -365,7 +361,6 @@
      $config['environment_indicator.settings']['favicon'] = TRUE;
      $config['environment_indicator.settings']['toolbar_integration'] = [TRUE];
      $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /";
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 3702992b6..135fa197c 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_testmode/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -30,7 +30,7 @@
      ];
      $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
      $settings['entity_update_batch_size'] = 50;
-@@ -362,7 +358,6 @@
+@@ -382,7 +378,6 @@
      $settings['config_exclude_modules'] = [
        'devel',
        'generated_content',
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 11e96cd1e..a6979936e 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_no_xmlsitemap/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -30,7 +30,7 @@
      $config['xmlsitemap_engines.settings']['submit'] = FALSE;
      $config['system.logging']['error_level'] = 'all';
      $config['system.performance']['cache']['page']['max_age'] = 900;
-@@ -346,7 +342,6 @@
+@@ -366,7 +362,6 @@
      $config['environment_indicator.settings']['toolbar_integration'] = [TRUE];
      $config['robotstxt.settings']['content'] = "User-agent: *\nDisallow: /";
      $config['shield.settings']['shield_enable'] = FALSE;
diff --git a/.vortex/installer/tests/Fixtures/handler_process/modules_none/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/modules_none/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 0cf1acb6b..d5c535bb0 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/modules_none/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/modules_none/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -116,7 +116,7 @@
      ];
      $settings['container_yamls'][0] = $this->app_root . '/' . $this->site_path . '/services.yml';
      $settings['entity_update_batch_size'] = 50;
-@@ -338,31 +276,14 @@
+@@ -358,31 +296,14 @@
      $this->requireSettingsFile();
  
      $config['automated_cron.settings']['interval'] = 0;
diff --git a/.vortex/installer/tests/Fixtures/handler_process/names/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/names/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 2d17ad331..f0691eb02 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/names/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/names/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -42,7 +42,7 @@
      $config['seckit.settings']['seckit_xss']['csp']['checkbox'] = FALSE;
      $config['seckit.settings']['seckit_xss']['csp']['upgrade-req'] = FALSE;
      $this->assertConfig($config);
-@@ -352,8 +352,8 @@
+@@ -372,8 +372,8 @@
      $config['system.mail']['interface']['default'] = 'test_mail_collector';
      $config['system.performance']['cache']['page']['max_age'] = 900;
      $config['reroute_email.settings']['enable'] = FALSE;
diff --git a/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 1b339da51..031206906 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/provision_database_lagoon/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -185,12 +185,10 @@
    }
  
    /**
-@@ -380,6 +560,256 @@
-     $settings['config_sync_directory'] = '../config/default';
-     $settings['trusted_host_patterns'] = [
+@@ -402,6 +582,279 @@
        '^localhost$',
-+    ];
-+    $this->assertSettings($settings);
+     ];
+     $this->assertSettings($settings);
 +  }
 +
 +  /**
@@ -439,6 +437,31 @@
 +      '^.+\.amazee\.io$',
 +      '^example1\.com$',
 +      '^example2$',
-     ];
-     $this->assertSettings($settings);
++    ];
++    $this->assertSettings($settings);
++  }
++
++  /**
++   * Test trusted host patterns for Lagoon routes without a scheme.
++   */
++  public function testEnvironmentLagoonSchemelessRoutes(): void {
++    $this->setEnvVars([
++      'LAGOON_KUBERNETES' => 1,
++      'LAGOON_ENVIRONMENT_TYPE' => 'development',
++      'LAGOON_ROUTES' => 'Example1.com:8443 , example2.com/subpath',
++    ]);
++
++    $this->requireSettingsFile();
++
++    $this->assertSettingsContains([
++      'trusted_host_patterns' => [
++        '^localhost$',
++        '^nginx\-php$',
++        '^.+\.amazee\.io$',
++        '^example1\.com$',
++        '^example2\.com$',
++      ],
++    ]);
    }
+ 
+ }
diff --git a/.vortex/installer/tests/Fixtures/handler_process/timezone_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/timezone_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/timezone_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/timezone_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index c30e71247..8ac795c73 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_be_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -9,7 +9,7 @@
   */
  #[Group('drupal_settings')]
  class EnvironmentSettingsTest extends SettingsTestCase {
-@@ -328,9 +324,9 @@
+@@ -348,9 +344,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_groups_no_fe_lint_no_theme_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_behat_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_dclint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_dclint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_dclint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_dclint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_docker_linters_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_docker_linters_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_docker_linters_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_docker_linters_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_eslint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_hadolint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_hadolint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_hadolint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_hadolint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_jest_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_jest_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_jest_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_jest_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index c30e71247..8ac795c73 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpcs_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -9,7 +9,7 @@
   */
  #[Group('drupal_settings')]
  class EnvironmentSettingsTest extends SettingsTestCase {
-@@ -328,9 +324,9 @@
+@@ -348,9 +344,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_phpstan_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_rector_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_stylelint_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**
diff --git a/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
index 4464f8744..7d0df7d19 100644
--- a/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
+++ b/.vortex/installer/tests/Fixtures/handler_process/tools_no_twig_circleci/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,4 +1,4 @@
-@@ -328,9 +328,9 @@
+@@ -348,9 +348,9 @@
    }
  
    /**

From 7da4f67503f9471d816af30620d4b8c4e621b191 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Thu, 3 Sep 2026 16:03:02 +1000
Subject: [PATCH 5/5] Re-triggered CI to clear a flaky check.