Merge branch 'master' into v2

cmgmyr · Sep 16, 2019 · 3bdffe2 · 3bdffe2
2 parents 7272f50 + f2de65c
commit 3bdffe2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .php_cs.cache
+.phpunit.result.cache
 build
 composer.lock
 files

diff --git a/composer.json b/composer.json
@@ -13,14 +13,14 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "illuminate/config": ">=5.5 <6.0",
-        "illuminate/support": ">=5.5 <6.0",
-        "illuminate/database": ">=5.5 <6.0"
+        "illuminate/config": "^5.5|^6.0",
+        "illuminate/support": "^5.5|^6.0",
+        "illuminate/database": "^5.5|^6.0"
     },
     "require-dev": {
         "adamwathan/faktory": "0.3.*",
         "friendsofphp/php-cs-fixer": "^2.5",
-        "orchestra/testbench": "~3.0",
+        "orchestra/testbench": "^3.0|^4.0",
         "phpunit/phpunit": "^7.0"
     },
     "autoload": {