Merge d670ff13ef9211e09c21fd22116375e2051a92f7 into 097313b0f1fc1ab280df08a0c85aaff28548eb51

src/TestSessionEnvironment.php

@@ -570,14 +570,18 @@ class TestSessionEnvironment
                 }
 
                 // Connect to database
-                $this->connectToDB($databaseConfig);
+                DB::connect($databaseConfig);
             } else {
                 // We've already connected to the database, do a fast check to see what database we're currently using
                 $db = DB::get_conn()->getSelectedDatabase();
                 if (isset($state->database) && $db != $state->database) {
                     $this->oldDatabaseName = $databaseConfig['database'];
                     $databaseConfig['database'] = $state->database;
-                    $this->connectToDB($databaseConfig);
+                    DB::connect($databaseConfig);
+                    // This is required for CMS 5.4+
+                    if (method_exists(DB::class, 'hasConfig') && DB::hasConfig('primary')) {
+                        DB::connect($databaseConfig, 'primary');
+                    }
                 }
             }
         }
@@ -613,15 +617,4 @@ class TestSessionEnvironment
 
         return true;
     }
-
-    private function connectToDB(array $databaseConfig): void
-    {
-        if (method_exists(DB::class, 'hasConfig') && DB::hasConfig('primary')) {
-            // CMS 5.4+ - ensure we connect the primary connection and not a replica
-            DB::connect($databaseConfig, 'primary');
-        } else {
-            // CMS 5.3 and below do not support replica connections
-            DB::connect($databaseConfig);
-        }
-    }
 }