Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit cd41812e11f3 · 2017-02-21T15:21:52.000+01:00
* 2.7:
  Use PHPUnit 6.0 on PHP 7.* test lines
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "symfony/config": "~2.8",
-        "symfony/intl": "~2.4|~3.0.0",
+        "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
         "symfony/yaml": "~2.2|~3.0.0",
         "psr/log": "~1.0"
     },
