Merge branch '3.9.x' into 4.1.x

* 3.9.x: Prepare 3.9.0 and 4.1.0 (#6492)
doctrine · Aug 15, 2024 · 2377cd4 · 2377cd4
2 parents 377d051 + d8f68ea
commit 2377cd4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 26 deletions.
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -11,29 +11,35 @@
             "slug": "latest",
             "upcoming": true
         },
+        {
+            "name": "4.2",
+            "branchName": "4.2.x",
+            "slug": "4.2",
+            "upcoming": true
+        },
         {
             "name": "4.1",
             "branchName": "4.1.x",
             "slug": "4.1",
-            "upcoming": true
+            "current": true
         },
         {
             "name": "4.0",
             "branchName": "4.0.x",
             "slug": "4.0",
-            "current": true
+            "maintained": false
         },
         {
             "name": "3.9",
             "branchName": "3.9.x",
             "slug": "3.9",
-            "upcoming": true
+            "maintained": true
         },
         {
             "name": "3.8",
             "branchName": "3.8.x",
             "slug": "3.8",
-            "maintained": true
+            "maintained": false
         },
         {
             "name": "3.7",

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # Doctrine DBAL
 
-|                   [5.0-dev][5.0]                    |                   [4.1-dev][4.1]                    |                     [4.0][4.0]                      |                   [3.9-dev][3.9]                    |                     [3.8][3.8]                      |
-|:---------------------------------------------------:|:---------------------------------------------------:|:---------------------------------------------------:|:---------------------------------------------------:|:---------------------------------------------------:|
-|      [![GitHub Actions][GA 5.0 image]][GA 5.0]      |      [![GitHub Actions][GA 4.1 image]][GA 4.1]      |      [![GitHub Actions][GA 4.0 image]][GA 4.0]      |      [![GitHub Actions][GA 3.9 image]][GA 3.9]      |      [![GitHub Actions][GA 3.8 image]][GA 3.8]      |
-|   [![AppVeyor][AppVeyor 5.0 image]][AppVeyor 5.0]   |   [![AppVeyor][AppVeyor 4.1 image]][AppVeyor 4.1]   |   [![AppVeyor][AppVeyor 4.0 image]][AppVeyor 4.0]   |   [![AppVeyor][AppVeyor 3.9 image]][AppVeyor 3.9]   |   [![AppVeyor][AppVeyor 3.8 image]][AppVeyor 3.8]   |
-| [![Code Coverage][Coverage 5.0 image]][CodeCov 5.0] | [![Code Coverage][Coverage 4.1 image]][CodeCov 4.1] | [![Code Coverage][Coverage 4.0 image]][CodeCov 4.0] | [![Code Coverage][Coverage 3.9 image]][CodeCov 3.9] | [![Code Coverage][Coverage 3.8 image]][CodeCov 3.8] |
-|                         N/A                         |                         N/A                         |  [![Type Coverage][TypeCov image]][TypeCov]         |                         N/A                         |                                                     |
+|                   [5.0-dev][5.0]                    |                   [4.2-dev][4.2]                    |                     [4.1][4.1]                      |                     [3.9][3.9]                      |
+|:---------------------------------------------------:|:---------------------------------------------------:|:---------------------------------------------------:|:---------------------------------------------------:|
+|      [![GitHub Actions][GA 5.0 image]][GA 5.0]      |      [![GitHub Actions][GA 4.2 image]][GA 4.2]      |      [![GitHub Actions][GA 4.1 image]][GA 4.1]      |      [![GitHub Actions][GA 3.9 image]][GA 3.9]      |
+|   [![AppVeyor][AppVeyor 5.0 image]][AppVeyor 5.0]   |   [![AppVeyor][AppVeyor 4.2 image]][AppVeyor 4.2]   |   [![AppVeyor][AppVeyor 4.1 image]][AppVeyor 4.1]   |   [![AppVeyor][AppVeyor 3.9 image]][AppVeyor 3.9]   |
+| [![Code Coverage][Coverage 5.0 image]][CodeCov 5.0] | [![Code Coverage][Coverage 4.2 image]][CodeCov 4.2] | [![Code Coverage][Coverage 4.1 image]][CodeCov 4.1] | [![Code Coverage][Coverage 3.9 image]][CodeCov 3.9] |
+|                         N/A                         |                         N/A                         |     [![Type Coverage][TypeCov image]][TypeCov]      |                         N/A                         |
 
 Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features for database schema introspection and schema management.
 
@@ -23,21 +23,21 @@ Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features f
   [GA 5.0]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A5.0.x
   [GA 5.0 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=5.0.x
 
+  [Coverage 4.2 image]: https://codecov.io/gh/doctrine/dbal/branch/4.2.x/graph/badge.svg
+  [4.2]: https://github.com/doctrine/dbal/tree/4.2.x
+  [CodeCov 4.2]: https://codecov.io/gh/doctrine/dbal/branch/4.2.x
+  [AppVeyor 4.2]: https://ci.appveyor.com/project/doctrine/dbal/branch/4.2.x
+  [AppVeyor 4.2 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/4.2.x?svg=true
+  [GA 4.2]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A4.2.x
+  [GA 4.2 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=4.2.x
+
   [Coverage 4.1 image]: https://codecov.io/gh/doctrine/dbal/branch/4.1.x/graph/badge.svg
   [4.1]: https://github.com/doctrine/dbal/tree/4.1.x
   [CodeCov 4.1]: https://codecov.io/gh/doctrine/dbal/branch/4.1.x
   [AppVeyor 4.1]: https://ci.appveyor.com/project/doctrine/dbal/branch/4.1.x
   [AppVeyor 4.1 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/4.1.x?svg=true
   [GA 4.1]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A4.1.x
   [GA 4.1 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=4.1.x
-
-  [Coverage 4.0 image]: https://codecov.io/gh/doctrine/dbal/branch/4.0.x/graph/badge.svg
-  [4.0]: https://github.com/doctrine/dbal/tree/4.0.x
-  [CodeCov 4.0]: https://codecov.io/gh/doctrine/dbal/branch/4.0.x
-  [AppVeyor 4.0]: https://ci.appveyor.com/project/doctrine/dbal/branch/4.0.x
-  [AppVeyor 4.0 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/4.0.x?svg=true
-  [GA 4.0]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A4.0.x
-  [GA 4.0 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=4.0.x
   [TypeCov]: https://shepherd.dev/github/doctrine/dbal
   [TypeCov image]: https://shepherd.dev/github/doctrine/dbal/coverage.svg
 
@@ -48,11 +48,3 @@ Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features f
   [AppVeyor 3.9 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/3.9.x?svg=true
   [GA 3.9]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A3.9.x
   [GA 3.9 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=3.9.x
-
-  [Coverage 3.8 image]: https://codecov.io/gh/doctrine/dbal/branch/3.8.x/graph/badge.svg
-  [3.8]: https://github.com/doctrine/dbal/tree/3.8.x
-  [CodeCov 3.8]: https://codecov.io/gh/doctrine/dbal/branch/3.8.x
-  [AppVeyor 3.8]: https://ci.appveyor.com/project/doctrine/dbal/branch/3.8.x
-  [AppVeyor 3.8 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/3.8.x?svg=true
-  [GA 3.8]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A3.8.x
-  [GA 3.8 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=3.8.x