Skip to content

Commit edc5491

Browse files
Merge branch '5.4' into 6.0
* 5.4: fix merge [HttpClient] mark test transient [Mime] Fix test [Translation] Fix TranslationPullCommand with ICU translations [PropertyInfo] Fix phpstan extractor issues Allow package-versions-deprecated plugin Update security.lb.xlf [Notifier] Use correct factory for the msteams transport Fix SessionListener without session in request Remove direct dependency on composer/package-versions-deprecated Remove the unused dependency on composer/package-versions-deprecated [Security/Http] Fix cookie clearing on logout [HttpClient] fix checking for recent curl consts
2 parents 4fd7c07 + 1afa446 commit edc5491

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"symfony/service-contracts": "^1.1|^2|^3"
2626
},
2727
"require-dev": {
28-
"composer/package-versions-deprecated": "^1.8",
2928
"symfony/stopwatch": "^5.4|^6.0",
3029
"symfony/cache": "^5.4|^6.0",
3130
"symfony/config": "^5.4|^6.0",
@@ -47,13 +46,13 @@
4746
"doctrine/collections": "~1.0",
4847
"doctrine/data-fixtures": "^1.1",
4948
"doctrine/dbal": "^2.13.1|^3.0",
50-
"doctrine/orm": "^2.7.3",
49+
"doctrine/orm": "^2.7.4",
5150
"psr/log": "^1|^2|^3"
5251
},
5352
"conflict": {
5453
"doctrine/dbal": "<2.13.1",
5554
"doctrine/lexer": "<1.1",
56-
"doctrine/orm": "<2.7.3",
55+
"doctrine/orm": "<2.7.4",
5756
"phpunit/phpunit": "<5.4.3",
5857
"symfony/cache": "<5.4",
5958
"symfony/dependency-injection": "<5.4",

0 commit comments

Comments
 (0)