Merge branch '2.7' into 2.8

* 2.7:
  fix deps=low
This commit is contained in:
Nicolas Grekas 2017-11-16 18:08:43 +02:00
commit 1c026e0a5b
3 changed files with 9 additions and 3 deletions

View File

@ -18,7 +18,7 @@
"require": {
"php": ">=5.3.9",
"ext-xml": "*",
"symfony/security": "~2.8|~3.0.0",
"symfony/security": "^2.8.31|~3.3.13",
"symfony/security-acl": "~2.7|~3.0.0",
"symfony/http-kernel": "~2.7|~3.0.0",
"symfony/polyfill-php70": "~1.0"

View File

@ -22,7 +22,10 @@
"symfony/security-core": "~2.4|~3.0.0"
},
"require-dev": {
"symfony/http-foundation": "~2.1|~3.0.0"
"symfony/http-foundation": "^2.7.38|~3.3.13"
},
"conflict": {
"symfony/http-foundation": "<2.7.38|~2.8,<2.8.31|~3.3,<3.3.13|~3.4,<3.4-beta5"
},
"suggest": {
"symfony/http-foundation": "For using the class SessionTokenStorage."

View File

@ -19,7 +19,7 @@
"php": ">=5.3.9",
"symfony/security-acl": "~2.7|~3.0.0",
"symfony/event-dispatcher": "~2.2|~3.0.0",
"symfony/http-foundation": "~2.1|~3.0.0",
"symfony/http-foundation": "^2.7.38|~3.3.13",
"symfony/http-kernel": "~2.4|~3.0.0",
"symfony/polyfill-php55": "~1.0",
"symfony/polyfill-php56": "~1.0",
@ -42,6 +42,9 @@
"symfony/expression-language": "~2.6|~3.0.0",
"symfony/ldap": "~2.8|~3.0.0"
},
"conflict": {
"symfony/http-foundation": "~2.8,<2.8.31|~3.4,<3.4-beta5"
},
"suggest": {
"symfony/form": "",
"symfony/validator": "For using the user password constraint",