Merge branch '2.8' into 3.1

fabpot · fabpot · commit f904f0406d5f · 2017-01-27T16:21:39.000-08:00
* 2.8:
  fixed composer.json
diff --git a/composer.json b/composer.json
@@ -89,12 +89,12 @@
         "egulias/email-validator": "~1.2,>=1.2.1",
         "symfony/polyfill-apcu": "~1.1",
         "symfony/security-acl": "~2.8|~3.0",
-        "phpdocumentor/reflection-docblock": "^3.0"
+        "phpdocumentor/reflection-docblock": "^3.0",
+        "sensio/framework-extra-bundle": "^3.0.2"
     },
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0",
         "phpdocumentor/type-resolver": "<0.2.0",
-        "sensio/framework-extra-bundle": "^3.0.2"
     },
     "provide": {
         "psr/cache-implementation": "1.0"
