Skip to content

Commit e7655a4

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: prevent the installation of unstable phpdocumentor/type-resolver releases chore: fix typo 'do' verb [Twig Bridge] Add PHPdoc information to some email methods Amend MoneyType twig to include a space. Convert previously defined date attribute to the expected class [WebProfilerBundle] Remove redundant code from logger template
2 parents cf8df28 + 5384658 commit e7655a4

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
@@ -42,7 +42,7 @@
4242
"conflict": {
4343
"doctrine/annotations": "<1.12",
4444
"phpdocumentor/reflection-docblock": "<3.2.2",
45-
"phpdocumentor/type-resolver": "<1.4.0",
45+
"phpdocumentor/type-resolver": "<1.4.0|>=1.7.0",
4646
"symfony/dependency-injection": "<5.4",
4747
"symfony/property-access": "<5.4",
4848
"symfony/property-info": "<5.4",

0 commit comments

Comments
 (0)