Skip to content

Commit da025fb

Browse files
committed
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)
2 parents c031ad0 + 00d0306 commit da025fb

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.doctrine-project.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,23 @@
1111
"slug": "latest",
1212
"upcoming": true
1313
},
14+
{
15+
"name": "3.8",
16+
"branchName": "3.8.x",
17+
"slug": "3.8",
18+
"upcoming": true
19+
},
1420
{
1521
"name": "3.7",
1622
"branchName": "3.7.x",
1723
"slug": "3.7",
18-
"upcoming": true
24+
"current": true
1925
},
2026
{
2127
"name": "3.6",
2228
"branchName": "3.6.x",
2329
"slug": "3.6",
24-
"current": true
30+
"maintained": false
2531
},
2632
{
2733
"name": "3.5",

.github/workflows/continuous-integration.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,19 +281,19 @@ jobs:
281281
- "10.4" # Oldest version supported by DBAL, LTS (Jun 2024)
282282
- "10.5" # LTS (Jun 2025)
283283
- "10.6" # LTS (Jul 2026)
284-
- "10.9" # STS (Aug 2023)
285284
- "10.10" # STS (Nov 2023)
286285
- "10.11" # LTS (Feb 2028)
287286
- "11.0" # STS (Jun 2024)
287+
- "11.1" # STS (Aug 2024)
288288
extension:
289289
- "mysqli"
290290
- "pdo_mysql"
291291
include:
292292
- php-version: "8.2"
293-
mariadb-version: "11.0"
293+
mariadb-version: "11.1"
294294
extension: "mysqli"
295295
- php-version: "8.3"
296-
mariadb-version: "11.0"
296+
mariadb-version: "11.1"
297297
extension: "pdo_mysql"
298298

299299
services:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"doctrine/coding-standard": "12.0.0",
4141
"fig/log-test": "^1",
4242
"jetbrains/phpstorm-stubs": "2023.2",
43-
"phpstan/phpstan": "1.10.34",
43+
"phpstan/phpstan": "1.10.35",
4444
"phpstan/phpstan-phpunit": "1.3.14",
4545
"phpstan/phpstan-strict-rules": "^1.5",
4646
"phpunit/phpunit": "10.2.2",

0 commit comments

Comments
 (0)