8000 Merge branch '2.8' into 3.3 · symfony/symfony@e4f00cc · GitHub
[go: up one dir, main page]

Skip to content

Commit e4f00cc

Browse files
Merge branch '2.8' into 3.3
* 2.8: fix deps=low
2 parents ea2447f + 1c026e0 commit e4f00cc

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-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.5.9|>=7.0.8",
2020
"ext-xml": "*",
21-
"symfony/security": "~3.3",
21+
"symfony/security": "^3.3.13|~3.4-beta5",
2222
"symfony/dependency-injection": "~3.3",
2323
"symfony/http-kernel": "~3.3",
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.8|~3.0"
2323
},
2424
"require-dev": {
25-
"symfony/http-foundation": "~2.8|~3.0"
25+
"symfony/http-foundation": "^2.8.31|~3.3.13|~3.4-beta5"
26+
},
27+
"conflict": {
28+
"symfony/http-foundation": "<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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^5.5.9|>=7.0.8",
2020
"symfony/event-dispatcher": "~2.8|~3.0",
21-
"symfony/http-foundation": "~2.8|~3.0",
21+
"symfony/http-foundation": "^2.8.31|~3.3.13|~3.4-beta5",
2222
"symfony/http-kernel": "~3.3",
2323
"symfony/polyfill-php56": "~1.0",
2424
"symfony/polyfill-php70": "~1.0",

0 commit comments

Comments
 (0)
0