Unified and simplified services connection options (#8310)

2 files changed, 4 insertions, 4 deletions

diff --git a/tests/Browser/README.md b/tests/Browser/README.md
index 1edd357d8..b761e6eba 100644
--- a/tests/Browser/README.md
+++ b/tests/Browser/README.md
@@ -28,7 +28,7 @@ php tests/Browser/install.php [version]
 
 Create a config file named `config-test.inc.php` in the Roundcube config dir.
 That file should provide specific `db_dsnw` and
-`default_host` values for testing purposes as well as the credentials of a
+`imap_host` values for testing purposes as well as the credentials of a
 valid IMAP user account used for running the tests with.
 
 Add these config options used by the Browser tests:
diff --git a/tests/Browser/bootstrap.php b/tests/Browser/bootstrap.php
index 3a0e4415c..54114991a 100644
--- a/tests/Browser/bootstrap.php
+++ b/tests/Browser/bootstrap.php
@@ -109,7 +109,7 @@ class bootstrap
     private static function init_db_user($db)
     {
         $rcmail = rcmail::get_instance();
-        $imap_host = $rcmail->config->get('default_host');
+        $imap_host = $rcmail->config->get('imap_host');
 
         if ($host = parse_url($imap_host, PHP_URL_HOST)) {
             $imap_host = $host;
@@ -152,12 +152,12 @@ class bootstrap
             self::$imap_ready = false;
         }
 
-        $imap_host = $rcmail->config->get('default_host');
+        $imap_host = $rcmail->config->get('imap_host');
         $a_host = parse_url($imap_host);
         if (!empty($a_host['host'])) {
             $imap_host = $a_host['host'];
             $imap_ssl  = isset($a_host['scheme']) && in_array($a_host['scheme'], ['ssl','imaps','tls']);
-            $imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : 143);
+            $imap_port = $a_host['port'] ?? ($imap_ssl ? 993 : 143);
         }
         else {
             $imap_port = 143;