Merge pull request #50 from recca0120/laravel-8

laravel 8
botman · Sep 10, 2020 · 1b6cf1b · 1b6cf1b
2 parents f76690f + 1ecd883
commit 1b6cf1b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/laravel-tests.yml b/.github/workflows/laravel-tests.yml
@@ -48,7 +48,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [7.3]
-        laravel: [7.x, 6.x, 5.8, 5.7, 5.5]
+        laravel: [8.x, 7.x, 6.x, 5.8, 5.7, 5.5]
 
     name: PHP${{ matrix.php }} with Laravel ${{ matrix.laravel }}
 
@@ -82,7 +82,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [7.4]
-        laravel: [7.x, 6.x, 5.8]
+        laravel: [8.x, 7.x, 6.x, 5.8]
 
     name: PHP${{ matrix.php }} with Laravel ${{ matrix.laravel }}
 

diff --git a/composer.json b/composer.json
@@ -17,15 +17,15 @@
     "require": {
         "php": "^7.2",
         "botman/botman": "~2.0 || ~3.0",
-        "guzzlehttp/guzzle": "~6.0",
-        "illuminate/support": "^5.5 || ^6.0 || ^7.0",
-        "illuminate/contracts": "^5.5 || ^6.0 || ^7.0",
-        "illuminate/console": "^5.5 || ^6.0 || ^7.0",
+        "guzzlehttp/guzzle": "~6.0 || ^7.0.1",
+        "illuminate/support": "^5.5 || ^6.0 || ^7.0 || ^8.0",
+        "illuminate/contracts": "^5.5 || ^6.0 || ^7.0 || ^8.0",
+        "illuminate/console": "^5.5 || ^6.0 || ^7.0 || ^8.0",
         "thecodingmachine/discovery": "^1.2"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.5 || ^4.0 || ^5.0",
-        "mockery/mockery": "^1.0"
+        "mockery/mockery": "^1.0",
+        "orchestra/testbench": "^3.5 || ^4.0 || ^5.0 || ^6.0"
     },
     "autoload": {
         "psr-4": {