Merge branch '3.3' into 3.4
* 3.3: fix deps=low
This commit is contained in:
commit
c5595a1f11
@ -18,7 +18,7 @@
|
|||||||
"require": {
|
"require": {
|
||||||
"php": "^5.5.9|>=7.0.8",
|
"php": "^5.5.9|>=7.0.8",
|
||||||
"ext-xml": "*",
|
"ext-xml": "*",
|
||||||
"symfony/security": "~3.4|~4.0",
|
"symfony/security": "~3.4-beta5|~4.0-beta5",
|
||||||
"symfony/dependency-injection": "~3.4|~4.0",
|
"symfony/dependency-injection": "~3.4|~4.0",
|
||||||
"symfony/http-kernel": "~3.3|~4.0",
|
"symfony/http-kernel": "~3.3|~4.0",
|
||||||
"symfony/polyfill-php70": "~1.0"
|
"symfony/polyfill-php70": "~1.0"
|
||||||
|
@ -22,7 +22,10 @@
|
|||||||
"symfony/security-core": "~2.8|~3.0|~4.0"
|
"symfony/security-core": "~2.8|~3.0|~4.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"symfony/http-foundation": "~2.8|~3.0|~4.0"
|
"symfony/http-foundation": "^2.8.31|~3.3.13|~3.4-beta5|~4.0-beta5"
|
||||||
|
},
|
||||||
|
"conflict": {
|
||||||
|
"symfony/http-foundation": "<2.8.31|~3.3,<3.3.13|~3.4,<3.4-beta5|~4.0,<4.0-beta5"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"symfony/http-foundation": "For using the class SessionTokenStorage."
|
"symfony/http-foundation": "For using the class SessionTokenStorage."
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
"require": {
|
"require": {
|
||||||
"php": "^5.5.9|>=7.0.8",
|
"php": "^5.5.9|>=7.0.8",
|
||||||
"symfony/event-dispatcher": "~2.8|~3.0|~4.0",
|
"symfony/event-dispatcher": "~2.8|~3.0|~4.0",
|
||||||
"symfony/http-foundation": "~2.8|~3.0|~4.0",
|
"symfony/http-foundation": "^2.8.31|~3.3.13|~3.4-beta5|~4.0-beta5",
|
||||||
"symfony/http-kernel": "~3.3|~4.0",
|
"symfony/http-kernel": "~3.3|~4.0",
|
||||||
"symfony/polyfill-php56": "~1.0",
|
"symfony/polyfill-php56": "~1.0",
|
||||||
"symfony/polyfill-php70": "~1.0",
|
"symfony/polyfill-php70": "~1.0",
|
||||||
|
Reference in New Issue
Block a user