Skip to content

Commit 36a5136

Browse files
committed
Merge branch '3.6.x' into 3.7.x
* 3.6.x: PHPUnit 9.6.11, PHPStan 1.10.32 (doctrine#6139) Remove duplicate alias and slug
2 parents d279b8f + 48d5be7 commit 36a5136

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.doctrine-project.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
{
2121
"name": "3.6",
2222
"branchName": "3.6.x",
23-
"slug": "current",
24-
"current": true,
25-
"aliases": ["stable"]
23+
"slug": "3.6",
24+
"current": true
2625
},
2726
{
2827
"name": "3.5",

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
"doctrine/coding-standard": "12.0.0",
4444
"fig/log-test": "^1",
4545
"jetbrains/phpstorm-stubs": "2023.1",
46-
"phpstan/phpstan": "1.10.29",
46+
"phpstan/phpstan": "1.10.32",
4747
"phpstan/phpstan-strict-rules": "^1.5",
48-
"phpunit/phpunit": "9.6.9",
48+
"phpunit/phpunit": "9.6.11",
4949
"psalm/plugin-phpunit": "0.18.4",
5050
"slevomat/coding-standard": "8.13.1",
5151
"squizlabs/php_codesniffer": "3.7.2",

0 commit comments

Comments
 (0)