bug #22695 [WebServerBundle] fix dependencies (xabbuh)

fabpot · fabpot · commit 50729d54e6ab · 2017-05-12T07:03:29.000-07:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [WebServerBundle] fix dependencies | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 84bb34f [WebServerBundle] fix dependencies
diff --git a/src/Symfony/Bundle/WebServerBundle/composer.json b/src/Symfony/Bundle/WebServerBundle/composer.json
@@ -18,6 +18,7 @@
     "require": {
         "php": ">=5.5.9",
         "symfony/console": "~2.8.8|~3.0.8|~3.1.2|~3.2",
+        "symfony/http-kernel": "~2.8|~3.0",
         "symfony/process": "~2.8|~3.0"
     },
     "autoload": {
@@ -26,6 +27,9 @@
             "/Tests/"
         ]
     },
+    "conflict": {
+        "symfony/dependency-injection": "<3.3"
+    },
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
