Merge branch '3.7.x' into 4.0.x

* 3.7.x: Prepare release 3.7.0 (doctrine#6165) PHPUnit 9.6.13, PHPStan 1.10.35 (doctrine#6164) Update MariaDB workflows (doctrine#6163)
derrabus · Sep 26, 2023 · da025fb · da025fb
2 parents c031ad0 + 00d0306
commit da025fb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -11,17 +11,23 @@
             "slug": "latest",
             "upcoming": true
         },
+        {
+            "name": "3.8",
+            "branchName": "3.8.x",
+            "slug": "3.8",
+            "upcoming": true
+        },
         {
             "name": "3.7",
             "branchName": "3.7.x",
             "slug": "3.7",
-            "upcoming": true
+            "current": true
         },
         {
             "name": "3.6",
             "branchName": "3.6.x",
             "slug": "3.6",
-            "current": true
+            "maintained": false
         },
         {
             "name": "3.5",

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -281,19 +281,19 @@ jobs:
           - "10.4"  # Oldest version supported by DBAL, LTS (Jun 2024)
           - "10.5"  # LTS (Jun 2025)
           - "10.6"  # LTS (Jul 2026)
-          - "10.9"  # STS (Aug 2023)
           - "10.10" # STS (Nov 2023)
           - "10.11" # LTS (Feb 2028)
           - "11.0"  # STS (Jun 2024)
+          - "11.1"  # STS (Aug 2024)
         extension:
           - "mysqli"
           - "pdo_mysql"
         include:
           - php-version: "8.2"
-            mariadb-version: "11.0"
+            mariadb-version: "11.1"
             extension: "mysqli"
           - php-version: "8.3"
-            mariadb-version: "11.0"
+            mariadb-version: "11.1"
             extension: "pdo_mysql"
 
     services:

diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
         "doctrine/coding-standard": "12.0.0",
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "2023.2",
-        "phpstan/phpstan": "1.10.34",
+        "phpstan/phpstan": "1.10.35",
         "phpstan/phpstan-phpunit": "1.3.14",
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpunit/phpunit": "10.2.2",