Skip to content

Commit c9fe28d

Browse files
Merge branch '5.3' into 5.4
* 5.3: [HttpClient] mark test transient [Mime] Fix test [Translation] Fix TranslationPullCommand with ICU translations 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 b7db1c6 + aaa6c47 commit c9fe28d

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
@@ -26,7 +26,6 @@
2626
"symfony/service-contracts": "^1.1|^2|^3"
2727
},
2828
"require-dev": {
29-
"composer/package-versions-deprecated": "^1.8",
3029
"symfony/stopwatch": "^4.4|^5.0|^6.0",
3130
"symfony/cache": "^5.4|^6.0",
3231
"symfony/config": "^4.4|^5.0|^6.0",
@@ -48,13 +47,13 @@
4847
"doctrine/collections": "~1.0",
4948
"doctrine/data-fixtures": "^1.1",
5049
"doctrine/dbal": "^2.13.1|^3.0",
51-
"doctrine/orm": "^2.7.3",
50+
"doctrine/orm": "^2.7.4"
5251
"psr/log": "^1|^2|^3"
5352
},
5453
"conflict": {
5554
"doctrine/dbal": "<2.13.1",
5655
"doctrine/lexer": "<1.1",
57-
"doctrine/orm": "<2.7.3",
56+
"doctrine/orm": "<2.7.4",
5857
"phpunit/phpunit": "<5.4.3",
5958
"symfony/cache": "<5.4",
6059
"symfony/dependency-injection": "<4.4",

0 commit comments

Comments
 (0)