Merge branch '7.x'

# Conflicts: # CHANGELOG.md # composer.json
2020-10-30 16:05:55 +01:00
parent fc79b8bb11 509708c7ee
commit 8b947ba34c
2 changed files with 5 additions and 620 deletions
--- a/composer.json
+++ b/composer.json
@@ -9,18 +9,18 @@
    "license": "MIT",
    "require": {
        "php": "^7.3|^8.0",
-        "fideloper/proxy": "^4.2",
+        "fideloper/proxy": "^4.4",
        "fruitcake/laravel-cors": "^2.0",
        "guzzlehttp/guzzle": "^7.0.1",
        "laravel/framework": "^8.12",
-        "laravel/tinker": "^2.0"
+        "laravel/tinker": "^2.5"
    },
    "require-dev": {
-        "facade/ignition": "^2.3.6",
+        "facade/ignition": "^2.5",
        "fakerphp/faker": "^1.9.1",
        "mockery/mockery": "^1.3.1",
        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.3"
+        "phpunit/phpunit": "^9.3.3"
    },
    "config": {
        "optimize-autoloader": true,