Merge pull request #3 from gdpa/laravel8

Support laravel 8
gdpa · Dec 20, 2020 · 2b22a0e · 2b22a0e
2 parents 1a15c2a + 057b08b
commit 2b22a0e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -10,10 +10,13 @@ jobs:
 
         strategy:
             matrix:
-                php: [ 7.2.5 ]
-                laravel: [ 7.* ]
+                php: [ 8.0, 7.3 ]
+                laravel: [ 8.* ]
                 dependency-version: [ prefer-lowest, prefer-stable ]
                 os: [ ubuntu-latest, windows-latest ]
+                include:
+                    -   laravel: 8.*
+                        testbench: 6.*
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
@@ -30,7 +33,7 @@ jobs:
 
             - name: Install dependencies
               run: |
-                  composer require --no-interaction --no-update
+                  composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
                   composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
 
             - name: Execute tests

diff --git a/README.md b/README.md
@@ -32,6 +32,21 @@ You can install the package via composer:
 composer require gdpa/chabok
 ```
 
+Install for laravel 7:
+``` bash
+composer require gdpa/chabok:^3.1
+```
+
+Install for laravel 6:
+``` bash
+composer require gdpa/chabok:^2.0
+```
+
+Install for laravel < 5.8:
+``` bash
+composer require gdpa/chabok:^1.0
+```
+
 ### Setting up the Chabok service
 
 Add your Chabok REST API Key to your `config/services.php`:

diff --git a/composer.json b/composer.json
@@ -10,15 +10,15 @@
         }
     ],
     "require": {
-        "php": "^7.2.5",
-        "guzzlehttp/guzzle": "~6.3.1|^7.0.1",
-        "illuminate/notifications": "^7.0",
-        "illuminate/support": "^7.0"
+        "php": "^7.3|^8.0",
+        "guzzlehttp/guzzle": "^7.0.1",
+        "illuminate/notifications": "^8.0",
+        "illuminate/support": "^8.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.1",
-        "phpunit/phpunit": "^8.0",
-        "orchestra/testbench": "~5.0"
+        "phpunit/phpunit": "^9.3",
+        "orchestra/testbench": "~6.0"
     },
     "autoload": {
         "psr-4": {