Merge branch 'master' into feature/query-log

Author: kevincobain2000

composer.json

@@ -24,8 +24,8 @@
  "require-dev": {
  "brianium/paratest": "^6.2",
  "friendsofphp/php-cs-fixer": "^3.5",
- "nunomaduro/collision": "^5.3",
- "orchestra/testbench": "^6.15",
+ "nunomaduro/collision": "^5.3|^6.0",
+ "orchestra/testbench": "^6.15|^7.0",
  "phpunit/phpunit": "^9.3",
  "spatie/laravel-ray": "^1.23",
  "squizlabs/php_codesniffer": "^3.6",