Skip to content

Commit e3c6f21

Browse files
committed
Merge branch '6.2' into 6.3
* 6.2: (21 commits) prevent the installation of unstable phpdocumentor/type-resolver releases Update UPGRADE-6.2.md [VarExporter] Fix possible memory-leak when using lazy-objects [Framework] Fix Infobip Mailer transport factory import [WebProfilerBundle] Fix form panel expanders chore: fix typo 'do' verb [Twig Bridge] Add PHPdoc information to some email methods [TwigBridge] Fix casing of currentRoute/currentRouteParameters methods Amend MoneyType twig to include a space. [DependencyInjection][ErrorHandler][FrameworkBundle][HttpKernel][TwigBridge] Fix "a" before "URL" [FrameworkBundle] Add alximy as backer of v6.2 Fixed undefined variable error [Security] Fix deprecated namespace Update UPGRADE-6.2.md don't register the MailerTestCommand symfony/console is not installed Bump Symfony version to 6.2.1 Update VERSION for 6.2.0 Update CHANGELOG for 6.2.0 [GHA] Fix scorecards Convert previously defined date attribute to the expected class ...
2 parents d0d49de + e7655a4 commit e3c6f21

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)