Merge branch '6.x' into 7.x

# Conflicts: # composer.json
2020-10-29 17:01:22 +01:00
parent 482d68a182 27338d9a99
commit 9af70cffa4
1 changed files with 1 additions and 1 deletions
--- 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,