Merge branch '3.3' into 3.4
* 3.3: Fix composer deps
This commit is contained in:
commit
434f0b09df
@ -20,9 +20,9 @@
|
||||
"ext-xml": "*",
|
||||
"symfony/cache": "~3.3|~4.0",
|
||||
"symfony/class-loader": "~3.2",
|
||||
"symfony/dependency-injection": "~3.3-beta2|~4.0",
|
||||
"symfony/dependency-injection": "~3.3|~4.0",
|
||||
"symfony/config": "~3.3|~4.0",
|
||||
"symfony/event-dispatcher": "~3.3|~4.0",
|
||||
"symfony/event-dispatcher": "^3.3.1|~4.0",
|
||||
"symfony/http-foundation": "~3.3|~4.0",
|
||||
"symfony/http-kernel": "~3.3|~4.0",
|
||||
"symfony/polyfill-mbstring": "~1.0",
|
||||
@ -70,7 +70,7 @@
|
||||
"symfony/property-info": "<3.3",
|
||||
"symfony/serializer": "<3.3",
|
||||
"symfony/translation": "<3.2",
|
||||
"symfony/validator": "<3.3-rc2",
|
||||
"symfony/validator": "<3.3",
|
||||
"symfony/workflow": "<3.3"
|
||||
},
|
||||
"suggest": {
|
||||
|
@ -18,7 +18,7 @@
|
||||
"require": {
|
||||
"php": ">=5.5.9",
|
||||
"symfony/security": "~3.3|~4.0",
|
||||
"symfony/dependency-injection": "~3.3-beta2|~4.0",
|
||||
"symfony/dependency-injection": "~3.3|~4.0",
|
||||
"symfony/http-kernel": "~3.3|~4.0",
|
||||
"symfony/polyfill-php70": "~1.0"
|
||||
},
|
||||
|
@ -32,7 +32,7 @@
|
||||
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/config": "<=3.3-beta1",
|
||||
"symfony/config": "<3.3",
|
||||
"symfony/finder": "<3.3",
|
||||
"symfony/yaml": "<3.3"
|
||||
},
|
||||
|
Reference in New Issue
Block a user