Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit e4f00cc6be02 · 2017-11-16T18:14:18.000+02:00
* 2.8:
  fix deps=low
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^5.5.9|>=7.0.8",
         "ext-xml": "*",
-        "symfony/security": "~3.3",
+        "symfony/security": "^3.3.13|~3.4-beta5",
         "symfony/dependency-injection": "~3.3",
         "symfony/http-kernel": "~3.3",
         "symfony/polyfill-php70": "~1.0"
diff --git a/src/Symfony/Component/Security/Csrf/composer.json b/src/Symfony/Component/Security/Csrf/composer.json
@@ -22,7 +22,10 @@
         "symfony/security-core": "~2.8|~3.0"
     },
     "require-dev": {
-        "symfony/http-foundation": "~2.8|~3.0"
+        "symfony/http-foundation": "^2.8.31|~3.3.13|~3.4-beta5"
+    },
+    "conflict": {
+        "symfony/http-foundation": "<2.8.31|~3.3,<3.3.13|~3.4,<3.4-beta5"
     },
     "suggest": {
         "symfony/http-foundation": "For using the class SessionTokenStorage."
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^5.5.9|>=7.0.8",
         "symfony/event-dispatcher": "~2.8|~3.0",
-        "symfony/http-foundation": "~2.8|~3.0",
+        "symfony/http-foundation": "^2.8.31|~3.3.13|~3.4-beta5",
         "symfony/http-kernel": "~3.3",
         "symfony/polyfill-php56": "~1.0",
         "symfony/polyfill-php70": "~1.0",
