From 3813dc767c359a9d4ac94833542e8761585b0bd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= <gabriel.ostrolucky@gmail.com>
Date: Sat, 26 Feb 2022 19:39:44 +0100
Subject: [PATCH] cs

---
 ConnectionFactory.php | 46 +++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/ConnectionFactory.php b/ConnectionFactory.php
index 5fff9884e..564bc0626 100644
--- a/ConnectionFactory.php
+++ b/ConnectionFactory.php
@@ -68,27 +68,9 @@ public function createConnection(array $params, ?Configuration $config = null, ?
             }
 
             $connection = DriverManager::getConnection($params, $config, $eventManager);
-            $params     = array_merge($connection->getParams(), $overriddenOptions);
+            $params     = $this->addDatabaseSuffix(array_merge($connection->getParams(), $overriddenOptions));
             $driver     = $connection->getDriver();
 
-            if (isset($params['dbname']) && isset($params['dbname_suffix'])) {
-                $params['dbname'] .= $params['dbname_suffix'];
-            }
-
-            if (isset($params['replica'])) {
-                foreach ($params['replica'] as $key => $replicaParams) {
-                    if (! isset($replicaParams['dbname'], $replicaParams['dbname_suffix'])) {
-                        continue;
-                    }
-
-                    $params['replica'][$key]['dbname'] .= $replicaParams['dbname_suffix'];
-                }
-            }
-
-            if (isset($params['primary']['dbname'], $params['primary']['dbname_suffix'])) {
-                $params['primary']['dbname'] .= $params['primary']['dbname_suffix'];
-            }
-
             if (! isset($params['charset'])) {
                 if ($driver instanceof AbstractMySQLDriver) {
                     $params['charset'] = 'utf8mb4';
@@ -162,4 +144,30 @@ private function initializeTypes(): void
 
         $this->initialized = true;
     }
+
+    /**
+     * @param array<string, mixed> $params
+     *
+     * @return array<string, mixed>
+     */
+    private function addDatabaseSuffix(array $params): array
+    {
+        if (isset($params['dbname']) && isset($params['dbname_suffix'])) {
+            $params['dbname'] .= $params['dbname_suffix'];
+        }
+
+        foreach ($params['replica'] ?? [] as $key => $replicaParams) {
+            if (! isset($replicaParams['dbname'], $replicaParams['dbname_suffix'])) {
+                continue;
+            }
+
+            $params['replica'][$key]['dbname'] .= $replicaParams['dbname_suffix'];
+        }
+
+        if (isset($params['primary']['dbname'], $params['primary']['dbname_suffix'])) {
+            $params['primary']['dbname'] .= $params['primary']['dbname_suffix'];
+        }
+
+        return $params;
+    }
 }