Merge pull request #4277 from doctrine/2.11.x-merge-up-into-3.0.x_5f6…

…7ea1896e106.77049600 Merge release 2.11.0 into 3.0.x
doctrine · Sep 21, 2020 · f8395ef · f8395ef
2 parents 789d900 + 1e36c43
commit f8395ef
Show file tree

Hide file tree

Showing 7 changed files with 241 additions and 31 deletions.
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -11,21 +11,27 @@
             "slug": "latest",
             "upcoming": true
         },
+        {
+            "name": "2.11",
+            "branchName": "2.11.x",
+            "slug": "2.11",
+            "current": true,
+            "aliases": [
+                "current",
+                "stable"
+            ]
+        },
         {
             "name": "2.10",
-            "branchName": "master",
+            "branchName": "2.10.x",
             "slug": "2.10",
-            "upcoming": true
+            "maintained": false
         },
         {
             "name": "2.9",
             "branchName": "2.9",
             "slug": "2.9",
-            "current": true,
-            "aliases": [
-                "current",
-                "stable"
-            ]
+            "maintained": false
         },
         {
             "name": "2.8",

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # Doctrine DBAL
 
-| [Master][Master] | [2.10][2.10] |
+| [Master][Master] | [2.11][2.11] |
 |:----------------:|:----------:|
-| [![Build status][Master image]][Master] | [![Build status][2.10 image]][2.10] |
-| [![GitHub Actions][GA master image]][GA master] | [![GitHub Actions][GA 2.10 image]][GA 2.10] |
-| [![AppVeyor][AppVeyor master image]][AppVeyor master] | [![AppVeyor][AppVeyor 2.10 image]][AppVeyor 2.10] |
-| [![Code Coverage][Coverage image]][CodeCov Master] | [![Code Coverage][Coverage 2.10 image]][CodeCov 2.10] |
+| [![Build status][Master image]][Master] | [![Build status][2.11 image]][2.11] |
+| [![GitHub Actions][GA master image]][GA master] | [![GitHub Actions][GA 2.11 image]][GA 2.11] |
+| [![AppVeyor][AppVeyor master image]][AppVeyor master] | [![AppVeyor][AppVeyor 2.11 image]][AppVeyor 2.11] |
+| [![Code Coverage][Coverage image]][CodeCov Master] | [![Code Coverage][Coverage 2.11 image]][CodeCov 2.11] |
 
 Powerful database abstraction layer with many features for database schema introspection, schema management and PDO abstraction.
 
@@ -24,11 +24,11 @@ Powerful database abstraction layer with many features for database schema intro
   [GA master]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3Amaster
   [GA master image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg
 
-  [2.10 image]: https://img.shields.io/travis/doctrine/dbal/2.10.x.svg?style=flat-square
-  [Coverage 2.10 image]: https://codecov.io/gh/doctrine/dbal/branch/2.10.x/graph/badge.svg
-  [2.10]: https://github.com/doctrine/dbal/tree/2.10.x
-  [CodeCov 2.10]: https://codecov.io/gh/doctrine/dbal/branch/2.10.x
-  [AppVeyor 2.10]: https://ci.appveyor.com/project/doctrine/dbal/branch/2.10.x
-  [AppVeyor 2.10 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/2.10.x?svg=true
-  [GA 2.10]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A2.10.x
-  [GA 2.10 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=2.10.x
+  [2.11 image]: https://img.shields.io/travis/doctrine/dbal/2.11.x.svg?style=flat-square
+  [Coverage 2.11 image]: https://codecov.io/gh/doctrine/dbal/branch/2.11.x/graph/badge.svg
+  [2.11]: https://github.com/doctrine/dbal/tree/2.11.x
+  [CodeCov 2.11]: https://codecov.io/gh/doctrine/dbal/branch/2.11.x
+  [AppVeyor 2.11]: https://ci.appveyor.com/project/doctrine/dbal/branch/2.11.x
+  [AppVeyor 2.11 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/2.11.x?svg=true
+  [GA 2.11]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A2.11.x
+  [GA 2.11 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=2.11.x
diff --git a/composer.json b/composer.json
@@ -65,8 +65,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.10.x-dev",
-            "dev-develop": "3.0.x-dev"
+            "dev-master": "4.0.x-dev"
         }
     }
 }