Merge pull request #4308 from kralos/4295-connection-params-bc-break

#4295 Keep master, slaves, keepReplica params in MasterSlaveConnection
doctrine · Oct 3, 2020 · ad0168d · ad0168d
2 parents 447225a + c50a58e
commit ad0168d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php b/lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php
@@ -38,21 +38,18 @@ public function __construct(
             $this->deprecated('Params key "master"', '"primary"');
 
             $params['primary'] = $params['master'];
-            unset($params['master']);
         }
 
         if (isset($params['slaves'])) {
             $this->deprecated('Params key "slaves"', '"replica"');
 
             $params['replica'] = $params['slaves'];
-            unset($params['slaves']);
         }
 
         if (isset($params['keepSlave'])) {
             $this->deprecated('Params key "keepSlave"', '"keepReplica"');
 
             $params['keepReplica'] = $params['keepSlave'];
-            unset($params['keepSlave']);
         }
 
         parent::__construct($params, $driver, $config, $eventManager);

diff --git a/tests/Doctrine/Tests/DBAL/Connections/MasterSlaveConnectionTest.php b/tests/Doctrine/Tests/DBAL/Connections/MasterSlaveConnectionTest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Doctrine\Tests\DBAL\Connections;
+
+use Doctrine\DBAL\Connections\MasterSlaveConnection;
+use Doctrine\DBAL\Driver;
+use Doctrine\Tests\DbalTestCase;
+
+class MasterSlaveConnectionTest extends DbalTestCase
+{
+    public function testConnectionParamsRemainAvailable(): void
+    {
+        $constructionParams = [
+            'driver' => 'pdo_mysql',
+            'keepSlave' => true,
+            'master' => [
+                'host' => 'master.host',
+                'user' => 'root',
+                'password' => 'password',
+                'port' => '1234',
+            ],
+            'slaves' => [
+                [
+                    'host' => 'slave1.host',
+                    'user' => 'root',
+                    'password' => 'password',
+                    'port' => '1234',
+                ],
+            ],
+        ];
+
+        $connection = new MasterSlaveConnection($constructionParams, $this->createStub(Driver::class));
+
+        $connectionParams = $connection->getParams();
+        foreach ($constructionParams as $key => $value) {
+            self::assertSame($value, $connectionParams[$key]);
+        }
+    }
+}