Make sure we dont include multiple vendor folders (#934)

* Make sure we dont include multiple vendor folders

* Require discovery 1.6

Author: Nyholm

composer.json

@@ -15,7 +15,7 @@
         "php": "^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "symfony/stopwatch": "~2.5",
         "nyholm/nsa": "^1.1"
     },