Skip to content

Commit 14be8f6

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: Bump Symfony version to 5.2.6 Update VERSION for 5.2.5 Update CHANGELOG for 5.2.5 Update translations for Norwegian Nynorsk (nn) #38756 Fix eventListener initialization when eventSubscriber constructor dispatch an event [FrameworkBundle] fix XSD clear unchecked choice radio boxes even if clear missing is set to false Fix `ConstraintViolation#getPropertyPath()` to always return `string` [ErrorHandler] Added missing type annotations to FlattenException [TwigBridge] Allow version 3 of the Twig extra packages Fix FrameworkBundle PropertyAccess definition when not in debug
2 parents 3583de7 + ed18a3f commit 14be8f6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
"symfony/expression-language": "^4.4|^5.0",
4949
"symfony/web-link": "^4.4|^5.0",
5050
"symfony/workflow": "^5.2",
51-
"twig/cssinliner-extra": "^2.12",
52-
"twig/inky-extra": "^2.12",
53-
"twig/markdown-extra": "^2.12"
51+
"twig/cssinliner-extra": "^2.12|^3",
52+
"twig/inky-extra": "^2.12|^3",
53+
"twig/markdown-extra": "^2.12|^3"
5454
},
5555
"conflict": {
5656
"phpdocumentor/reflection-docblock": "<3.2.2",

0 commit comments

Comments
 (0)