Merge branch '6.x' into 7.x

driesvints · driesvints · commit 9af70cffa4bd · 2020-10-29T17:01:22.000+01:00
# Conflicts:
#	composer.json
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "fakerphp/faker": "^1.9.1",
         "mockery/mockery": "^1.3.1",
         "nunomaduro/collision": "^4.1",
-        "phpunit/phpunit": "^8.5"
+        "phpunit/phpunit": "^8.5|^9.3"
     },
     "config": {
         "optimize-autoloader": true,
