Skip to content

Commit dc3caa1

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Indicate compatibility with psr/log 2 and 3 [ci] Fix wrongly skipped integration tests
2 parents ae8499d + 9a6424f commit dc3caa1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"symfony/http-client-contracts": "^1.1|^2.0|^3.0",
2323
"symfony/http-foundation": "^5.4|^6.0",
2424
"symfony/polyfill-ctype": "^1.8",
25-
"psr/log": "~1.0"
25+
"psr/log": "^1|^2"
2626
},
2727
"require-dev": {
2828
"symfony/browser-kit": "^5.4|^6.0",
@@ -42,7 +42,7 @@
4242
"twig/twig": "^2.13|^3.0.4"
4343
},
4444
"provide": {
45-
"psr/log-implementation": "1.0"
45+
"psr/log-implementation": "1.0|2.0"
4646
},
4747
"conflict": {
4848
"symfony/browser-kit": "<5.4",

0 commit comments

Comments
 (0)