From 4f4387cbbd71a3a5037e44cefa466734499e1e57 Mon Sep 17 00:00:00 2001
From: Simon Podlipsky <simon@podlipsky.net>
Date: Wed, 13 Apr 2022 21:39:07 +0200
Subject: [PATCH] refactor: drop master

---
 Command/CreateDatabaseDoctrineCommand.php                   | 5 -----
 Command/DropDatabaseDoctrineCommand.php                     | 5 -----
 DependencyInjection/DoctrineExtension.php                   | 3 +--
 Tests/DependencyInjection/AbstractDoctrineExtensionTest.php | 6 +++---
 ...l => dbal_service_single_primary_replica_connection.xml} | 0
 ...l => dbal_service_single_primary_replica_connection.yml} | 0
 6 files changed, 4 insertions(+), 15 deletions(-)
 rename Tests/DependencyInjection/Fixtures/config/xml/{dbal_service_single_master_slave_connection.xml => dbal_service_single_primary_replica_connection.xml} (100%)
 rename Tests/DependencyInjection/Fixtures/config/yml/{dbal_service_single_master_slave_connection.yml => dbal_service_single_primary_replica_connection.yml} (100%)

diff --git a/Command/CreateDatabaseDoctrineCommand.php b/Command/CreateDatabaseDoctrineCommand.php
index dc04d0330..23d3fd790 100644
--- a/Command/CreateDatabaseDoctrineCommand.php
+++ b/Command/CreateDatabaseDoctrineCommand.php
@@ -54,15 +54,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $params = $connection->getParams();
 
-        // Since doctrine/dbal 2.11 master has been replaced by primary
         if (isset($params['primary'])) {
             $params = $params['primary'];
         }
 
-        if (isset($params['master'])) {
-            $params = $params['master'];
-        }
-
         // Cannot inject `shard` option in parent::getDoctrineConnection
         // cause it will try to connect to a non-existing database
         if (isset($params['shards'])) {
diff --git a/Command/DropDatabaseDoctrineCommand.php b/Command/DropDatabaseDoctrineCommand.php
index 5f3c5c823..e51f86857 100644
--- a/Command/DropDatabaseDoctrineCommand.php
+++ b/Command/DropDatabaseDoctrineCommand.php
@@ -65,15 +65,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $params = $connection->getParams();
 
-        // Since doctrine/dbal 2.11 master has been replaced by primary
         if (isset($params['primary'])) {
             $params = $params['primary'];
         }
 
-        if (isset($params['master'])) {
-            $params = $params['master'];
-        }
-
         if (isset($params['shards'])) {
             $shards = $params['shards'];
             // Default select global
diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
index 78b1a074d..206d9fb8e 100644
--- a/DependencyInjection/DoctrineExtension.php
+++ b/DependencyInjection/DoctrineExtension.php
@@ -357,7 +357,7 @@ protected function getConnectionOptions(array $connection): array
         }
 
         if (! empty($options['slaves']) && ! empty($options['replica']) && ! empty($options['shards'])) {
-            throw new InvalidArgumentException('Sharding and master-slave connection cannot be used together');
+            throw new InvalidArgumentException('Sharding and primary-replica connection cannot be used together');
         }
 
         foreach (['shards', 'replica', 'slaves'] as $connectionKey) {
@@ -382,7 +382,6 @@ protected function getConnectionOptions(array $connection): array
                 'shardChoser' => true,
                 'platform' => true,
                 'slaves' => true,
-                'master' => true,
                 'primary' => true,
                 'replica' => true,
                 'shards' => true,
diff --git a/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
index f60eaa62b..2be5b5258 100644
--- a/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
+++ b/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
@@ -185,9 +185,9 @@ public function testDbalDbnameSuffix(): void
         $this->assertSame('_test', $config['dbname_suffix']);
     }
 
-    public function testDbalLoadSingleMasterSlaveConnection(): void
+    public function testDbalLoadSinglePrimaryReplicaConnection(): void
     {
-        $container = $this->loadContainer('dbal_service_single_master_slave_connection');
+        $container = $this->loadContainer('dbal_service_single_primary_replica_connection');
         $param     = $container->getDefinition('doctrine.dbal.default_connection')->getArgument(0);
 
         $this->assertEquals(PrimaryReadReplicaConnection::class, $param['wrapperClass']);
@@ -202,7 +202,7 @@ public function testDbalLoadSingleMasterSlaveConnection(): void
                 'unix_socket' => '/path/to/mysqld.sock',
                 'driverOptions' => [PDO::ATTR_STRINGIFY_FETCHES => 1],
             ],
-            $param['primary'] ?? $param['master'] // TODO: Remove 'master' support here when we require dbal >= 2.11
+            $param['primary']
         );
         $this->assertEquals(
             [
diff --git a/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_master_slave_connection.xml b/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_primary_replica_connection.xml
similarity index 100%
rename from Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_master_slave_connection.xml
rename to Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_primary_replica_connection.xml
diff --git a/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_single_master_slave_connection.yml b/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_single_primary_replica_connection.yml
similarity index 100%
rename from Tests/DependencyInjection/Fixtures/config/yml/dbal_service_single_master_slave_connection.yml
rename to Tests/DependencyInjection/Fixtures/config/yml/dbal_service_single_primary_replica_connection.yml