Merge remote-tracking branch 'origin/1.12.x' into 2.1.x

# Conflicts: # .doctrine-project.json
doctrine · Oct 18, 2020 · 4c767f2 · 4c767f2
2 parents 64cc8f1 + 934bdcf
commit 4c767f2
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -4,22 +4,28 @@
   "slug": "doctrine-bundle",
   "versions": [
     {
-      "name": "2.1",
+      "name": "2.2",
       "branchName": "master",
       "slug": "latest",
       "upcoming": true
     },
     {
-      "name": "2.0",
-      "branchName": "2.0.x",
-      "slug": "2.0",
+      "name": "2.1",
+      "branchName": "2.1.x",
+      "slug": "2.1",
       "aliases": [
         "current",
         "stable"
       ],
       "current": true,
       "maintained": true
     },
+    {
+      "name": "2.0",
+      "branchName": "2.0.x",
+      "slug": "2.0",
+      "maintained": false
+    },
     {
       "name": "1.12",
       "branchName": "1.12.x",
@@ -93,4 +99,4 @@
       "maintained": false
     }
   ]
-}
+}
diff --git a/Command/CreateDatabaseDoctrineCommand.php b/Command/CreateDatabaseDoctrineCommand.php
@@ -57,6 +57,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $params = $params['master'];
         }
 
+        // Since doctrine/dbal 2.11 master has been replaced by primary
+        if (isset($params['primary'])) {
+            $params = $params['primary'];
+        }
+
         // 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
@@ -66,6 +66,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $params = $params['master'];
         }
 
+        // Since doctrine/dbal 2.11 master has been replaced by primary
+        if (isset($params['primary'])) {
+            $params = $params['primary'];
+        }
+
         if (isset($params['shards'])) {
             $shards = $params['shards'];
             // Default select global

diff --git a/Command/Proxy/RunSqlDoctrineCommand.php b/Command/Proxy/RunSqlDoctrineCommand.php
@@ -43,6 +43,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         DoctrineCommandHelper::setApplicationConnection($this->getApplication(), $input->getOption('connection'));
 
+        // compatibility with doctrine/dbal 2.11+
+        // where this option is also present and unsupported before we are not switching to use a ConnectionProvider
+        $input->setOption('connection', null);
+
         return parent::execute($input, $output);
     }
 }