Merge branch '4.3' into 4.4
* 4.3: [Workflow] fix lowest dep
This commit is contained in:
commit
a0708cca7f
|
@ -36,7 +36,6 @@
|
|||
"symfony/expression-language": "^3.4|^4.0|^5.0",
|
||||
"symfony/form": "^3.4|^4.0|^5.0",
|
||||
"symfony/framework-bundle": "^4.4|^5.0",
|
||||
"symfony/http-foundation": "^3.4|^4.0|^5.0",
|
||||
"symfony/process": "^3.4|^4.0|^5.0",
|
||||
"symfony/serializer": "^4.4|^5.0",
|
||||
"symfony/translation": "^3.4|^4.0|^5.0",
|
||||
|
@ -48,10 +47,10 @@
|
|||
},
|
||||
"conflict": {
|
||||
"symfony/browser-kit": "<4.2",
|
||||
"symfony/twig-bundle": "<4.4",
|
||||
"symfony/framework-bundle": "<4.4",
|
||||
"symfony/console": "<3.4",
|
||||
"symfony/ldap": "<4.4"
|
||||
"symfony/framework-bundle": "<4.4",
|
||||
"symfony/ldap": "<4.4",
|
||||
"symfony/twig-bundle": "<4.4"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" },
|
||||
|
|
|
@ -29,9 +29,8 @@
|
|||
"symfony/stopwatch": "^3.4|^4.0|^5.0"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/dependency-injection": "<3.4",
|
||||
"symfony/messenger": "<4.2",
|
||||
"symfony/form": "<4.3"
|
||||
"symfony/form": "<4.3",
|
||||
"symfony/messenger": "<4.2"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": { "Symfony\\Bundle\\WebProfilerBundle\\": "" },
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
],
|
||||
"require": {
|
||||
"php": "^7.1.3",
|
||||
"symfony/property-access": "~3.4.31|^4.3.4|^5.0"
|
||||
"symfony/property-access": "^3.4|^4.3|^5.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"psr/log": "~1.0",
|
||||
|
|
Reference in New Issue