Merge branch '3.6.x' into 4.0.x

* 3.6.x: Run tests with MariaDB 10.10 Prepare 3.6.0
doctrine · Feb 7, 2023 · a759917 · a759917
2 parents 1295b5f + 85b98cb
commit a759917
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -14,15 +14,15 @@
         {
             "name": "3.6",
             "branchName": "3.6.x",
-            "slug": "3.6",
-            "upcoming": true
+            "slug": "current",
+            "current": true,
+            "aliases": ["stable"]
         },
         {
             "name": "3.5",
             "branchName": "3.5.x",
-            "slug": "current",
-            "current": true,
-            "aliases": ["stable"]
+            "slug": "3.5",
+            "maintained": false
         },
         {
             "name": "3.4",

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -278,15 +278,16 @@ jobs:
           - "10.5"
           - "10.7"
           - "10.9"
+          - "10.10"
         extension:
           - "mysqli"
           - "pdo_mysql"
         include:
           - php-version: "8.2"
-            mariadb-version: "10.9"
+            mariadb-version: "10.10"
             extension: "mysqli"
           - php-version: "8.2"
-            mariadb-version: "10.9"
+            mariadb-version: "10.10"
             extension: "pdo_mysql"
 
     services:

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # Doctrine DBAL
 
-|                 [4.0-dev][4.0]                  |                     [3.5][3.5]                      |
+|                 [4.0-dev][4.0]                  |                     [3.6][3.6]                      |
 |:-----------------------------------------------:|:---------------------------------------------------:|
-|    [![GitHub Actions][GA 4.0 image]][GA 4.0]    |      [![GitHub Actions][GA 3.5 image]][GA 3.5]      |
-| [![AppVeyor][AppVeyor 4.0 image]][AppVeyor 4.0] |   [![AppVeyor][AppVeyor 3.5 image]][AppVeyor 3.5]   |
-| [![Code Coverage][Coverage image]][CodeCov 4.0] | [![Code Coverage][Coverage 3.5 image]][CodeCov 3.5] |
-|                       N/A                       | [![Code Coverage][TypeCov 3.5 image]][TypeCov 3.5]  |
+|    [![GitHub Actions][GA 4.0 image]][GA 4.0]    |      [![GitHub Actions][GA 3.6 image]][GA 3.6]      |
+| [![AppVeyor][AppVeyor 4.0 image]][AppVeyor 4.0] |   [![AppVeyor][AppVeyor 3.6 image]][AppVeyor 3.6]   |
+| [![Code Coverage][Coverage image]][CodeCov 4.0] | [![Code Coverage][Coverage 3.6 image]][CodeCov 3.6] |
+|                       N/A                       | [![Type Coverage][TypeCov 3.6 image]][TypeCov 3.6]  |
 
 Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features for database schema introspection and schema management.
 
@@ -23,12 +23,12 @@ Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features f
   [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
 
-  [Coverage 3.5 image]: https://codecov.io/gh/doctrine/dbal/branch/3.5.x/graph/badge.svg
-  [3.5]: https://github.com/doctrine/dbal/tree/3.5.x
-  [CodeCov 3.5]: https://codecov.io/gh/doctrine/dbal/branch/3.5.x
-  [AppVeyor 3.5]: https://ci.appveyor.com/project/doctrine/dbal/branch/3.5.x
-  [AppVeyor 3.5 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/3.5.x?svg=true
-  [GA 3.5]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A3.5.x
-  [GA 3.5 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=3.5.x
-  [TypeCov 3.5]: https://shepherd.dev/github/doctrine/dbal
-  [TypeCov 3.5 image]: https://shepherd.dev/github/doctrine/dbal/coverage.svg
+  [Coverage 3.6 image]: https://codecov.io/gh/doctrine/dbal/branch/3.6.x/graph/badge.svg
+  [3.6]: https://github.com/doctrine/dbal/tree/3.6.x
+  [CodeCov 3.6]: https://codecov.io/gh/doctrine/dbal/branch/3.6.x
+  [AppVeyor 3.6]: https://ci.appveyor.com/project/doctrine/dbal/branch/3.6.x
+  [AppVeyor 3.6 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/3.6.x?svg=true
+  [GA 3.6]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A3.6.x
+  [GA 3.6 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=3.6.x
+  [TypeCov 3.6]: https://shepherd.dev/github/doctrine/dbal
+  [TypeCov 3.6 image]: https://shepherd.dev/github/doctrine/dbal/coverage.svg