Merge pull request #2 from gdpa/laravel7

Laravel 7 support for illuminate 7 and guzzle 7
gdpa · Dec 20, 2020 · 1a15c2a · 1a15c2a
2 parents 34c64fe + 5590981
commit 1a15c2a
Show file tree

Hide file tree

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

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
-    "name": "gdpa/chabok",
-    "description": "Chabok Notifications driver",
-    "homepage": "https://github.com/gdpa/chabok",
+    "name": "gdpa/kavenegar",
+    "description": "Kavenegar Notifications driver",
+    "homepage": "https://github.com/gdpa/kavenegar",
     "license": "MIT",
     "authors": [
         {
@@ -10,24 +10,24 @@
         }
     ],
     "require": {
-        "php": "^7.3|^8.0",
-        "guzzlehttp/guzzle": "^7.0.1",
-        "illuminate/notifications": "^8.0",
-        "illuminate/support": "^8.0"
+        "php": "^7.2.5",
+        "guzzlehttp/guzzle": "~6.3.1|^7.0.1",
+        "illuminate/notifications": "^7.0",
+        "illuminate/support": "^7.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.1",
-        "phpunit/phpunit": "^9.3",
-        "orchestra/testbench": "~6.0"
+        "phpunit/phpunit": "^8.0",
+        "orchestra/testbench": "~5.0"
     },
     "autoload": {
         "psr-4": {
-            "NotificationChannels\\Chabok\\": "src"
+            "NotificationChannels\\Kavenegar\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "NotificationChannels\\Chabok\\Test\\": "tests"
+            "NotificationChannels\\Kavenegar\\Test\\": "tests"
         }
     },
     "scripts": {