Skip to content

Commit c662971

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: fix merge declare Symfony Flex as an allowed plugin [4.4] Allow the symfony/flex plugin Fixed broken build on Symfony 5.4 (#10)
2 parents 042a948 + 16d94a1 commit c662971

File tree

2 files changed

+147
-148
lines changed

2 files changed

+147
-148
lines changed

composer.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"symfony/property-info": "6.2.*",
3131
"symfony/proxy-manager-bridge": "6.2.*",
3232
"symfony/rate-limiter": "6.2.*",
33+
"symfony/routing": "6.2.*",
3334
"symfony/security-bundle": "6.2.*",
3435
"symfony/serializer": "6.2.*",
3536
"symfony/translation": "6.2.*",
@@ -53,6 +54,9 @@
5354
"symfony/web-profiler-bundle": "6.2.*"
5455
},
5556
"config": {
57+
"allow-plugins": {
58+
"symfony/flex": true
59+
},
5660
"preferred-install": {
5761
"*": "dist"
5862
},

0 commit comments

Comments
 (0)