Skip to content

Commit 1c026e0

Browse files
Merge branch '2.7' into 2.8
* 2.7: fix deps=low
2 parents 44c5d7f + 7993ce5 commit 1c026e0

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=5.3.9",
2020
"ext-xml": "*",
21-
"symfony/security": "~2.8|~3.0.0",
21+
"symfony/security": "^2.8.31|~3.3.13",
2222
"symfony/security-acl": "~2.7|~3.0.0",
2323
"symfony/http-kernel": "~2.7|~3.0.0",
2424
"symfony/polyfill-php70": "~1.0"

src/Symfony/Component/Security/Csrf/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
"symfony/security-core": "~2.4|~3.0.0"
2323
},
2424
"require-dev": {
25-
"symfony/http-foundation": "~2.1|~3.0.0"
25+
"symfony/http-foundation": "^2.7.38|~3.3.13"
26+
},
27+
"conflict": {
28+
"symfony/http-foundation": "<2.7.38|~2.8,<2.8.31|~3.3,<3.3.13|~3.4,<3.4-beta5"
2629
},
2730
"suggest": {
2831
"symfony/http-foundation": "For using the class SessionTokenStorage."

src/Symfony/Component/Security/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php": ">=5.3.9",
2020
"symfony/security-acl": "~2.7|~3.0.0",
2121
"symfony/event-dispatcher": "~2.2|~3.0.0",
22-
"symfony/http-foundation": "~2.1|~3.0.0",
22+
"symfony/http-foundation": "^2.7.38|~3.3.13",
2323
"symfony/http-kernel": "~2.4|~3.0.0",
2424
"symfony/polyfill-php55": "~1.0",
2525
"symfony/polyfill-php56": "~1.0",
@@ -42,6 +42,9 @@
4242
"symfony/expression-language": "~2.6|~3.0.0",
4343
"symfony/ldap": "~2.8|~3.0.0"
4444
},
45+
"conflict": {
46+
"symfony/http-foundation": "~2.8,<2.8.31|~3.4,<3.4-beta5"
47+
},
4548
"suggest": {
4649
"symfony/form": "",
4750
"symfony/validator": "For using the user password constraint",

0 commit comments

Comments
 (0)