Merge pull request #15 from BertvanHoekelen/master

Laravel 6 upgrade
joblocal · Sep 9, 2019 · d3ef0c6 · d3ef0c6
2 parents cf3408b + c7ac351
commit d3ef0c6
Show file tree

Hide file tree

Showing 2 changed files with 319 additions and 304 deletions.
diff --git a/composer.json b/composer.json
@@ -22,14 +22,14 @@
   ],
   "require": {
     "php": ">=7.1.3",
-    "illuminate/queue": "^5.6",
-    "illuminate/support": "^5.6",
+    "illuminate/queue": "^5.6|^6.0",
+    "illuminate/support": "^5.6|^6.0",
     "aws/aws-sdk-php": "^3.62"
   },
   "require-dev": {
     "phpunit/phpunit": "^8",
     "squizlabs/php_codesniffer": "^3",
-    "orchestra/testbench": "^3.6"
+    "orchestra/testbench": "~3.8|^4.0"
   },
   "autoload": {
     "psr-4": {