Skip to content

Commit 0f53206

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Use mb_convert_encoding instead of utf8_decode [FrameworkBundle] Always add CacheCollectorPass Fix "Notice: Undefined index: headers" in messenger with Oracle [String] Fix ansi escape sequences regex Indicate support for doctrine/persistence 3 [Routing] fix router base url when default uri has trailing slash Replace deprecated String.prototype.substr()
2 parents f774931 + f3d8c57 commit 0f53206

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
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=8.0.2",
2020
"doctrine/event-manager": "~1.0",
21-
"doctrine/persistence": "^2",
21+
"doctrine/persistence": "^2|^3",
2222
"symfony/deprecation-contracts": "^2.1|^3",
2323
"symfony/polyfill-ctype": "~1.8",
2424
"symfony/polyfill-mbstring": "~1.0",

0 commit comments

Comments
 (0)