Skip to content

Commit 157460c

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 be53645 + 361aa90 commit 157460c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"symfony/expression-language": "^5.4|^6.0",
2626
"symfony/dependency-injection": "^5.4|^6.0",
2727
"doctrine/annotations": "^1.12",
28-
"psr/log": "~1.0"
28+
"psr/log": "^1|^2|^3"
2929
},
3030
"conflict": {
3131
"doctrine/annotations": "<1.12",

0 commit comments

Comments
 (0)