Merge remote-tracking branch 'origin/master'

nicolas-grekas · nicolas-grekas · commit 4b9ed9e125fb · 2017-11-12T17:48:49.000+01:00
* origin/master:
  Drop support for PHPUnit 4
diff --git a/composer.json b/composer.json
@@ -101,7 +101,7 @@
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
         "phpdocumentor/type-resolver": "<0.2.1",
-        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+        "phpunit/phpunit": "<5.4.3"
     },
     "provide": {
         "psr/cache-implementation": "1.0",
