Merge pull request #6 from cashier-provider/2.x

Added Laravel 9 support
cashbox-laravel · Feb 14, 2022 · f580523 · f580523
2 parents 6f8ae22 + e7b292d
commit f580523
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 83 deletions.
diff --git a/.codecov.yml b/.codecov.yml
diff --git a/.github/workflows/laravel-6-8.yml → .github/workflows/laravel-6.yml b/.github/workflows/laravel-6-8.yml → .github/workflows/laravel-6.yml
@@ -1,4 +1,4 @@
-name: "Laravel 6-8"
+name: "Laravel 6"
 on: [ push ]
 
 jobs:
@@ -9,9 +9,9 @@ jobs:
             fail-fast: true
             matrix:
                 php: [ "7.3", "7.4", "8.0" ]
-                laravel: [ "6.0", "7.0", "8.0" ]
+                laravel: [ "6.0" ]
 
-        name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
+        name: PHP ${{ matrix.php }}
 
         services:
             mysql:

diff --git a/.github/workflows/laravel-7.yml b/.github/workflows/laravel-7.yml
@@ -0,0 +1,43 @@
+name: "Laravel 7"
+on: [ push ]
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        strategy:
+            fail-fast: true
+            matrix:
+                php: [ "7.3", "7.4", "8.0" ]
+                laravel: [ "7.0" ]
+
+        name: PHP ${{ matrix.php }}
+
+        services:
+            mysql:
+                image: mysql:5.7
+                env:
+                    MYSQL_ROOT_PASSWORD: root
+                    MYSQL_DATABASE: default
+                ports:
+                    - 3306:3306
+                options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v2
+
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php }}
+                    extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv, bcmath
+                    coverage: none
+
+            -   name: Install dependencies
+                run: composer require laravel/framework:^${{ matrix.laravel }} --prefer-stable --prefer-dist --no-progress --no-interaction
+
+            -   name: Execute tests
+                run: sudo vendor/bin/phpunit
+                env:
+                    MYSQL_HOST: 127.0.0.1
diff --git a/.github/workflows/laravel-8.yml b/.github/workflows/laravel-8.yml
@@ -11,7 +11,7 @@ jobs:
                 php: [ "7.3", "7.4", "8.0", "8.1" ]
                 laravel: [ "8.0" ]
 
-        name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
+        name: PHP ${{ matrix.php }}
 
         services:
             mysql:

diff --git a/.github/workflows/laravel-9.yml b/.github/workflows/laravel-9.yml
@@ -0,0 +1,43 @@
+name: "Laravel 9"
+on: [ push ]
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        strategy:
+            fail-fast: true
+            matrix:
+                php: [ "8.0", "8.1" ]
+                laravel: [ "9.0" ]
+
+        name: PHP ${{ matrix.php }}
+
+        services:
+            mysql:
+                image: mysql:5.7
+                env:
+                    MYSQL_ROOT_PASSWORD: root
+                    MYSQL_DATABASE: default
+                ports:
+                    - 3306:3306
+                options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v2
+
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php }}
+                    extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv, bcmath
+                    coverage: none
+
+            -   name: Install dependencies
+                run: composer require laravel/framework:^${{ matrix.laravel }} --prefer-stable --prefer-dist --no-progress --no-interaction
+
+            -   name: Execute tests
+                run: sudo vendor/bin/phpunit
+                env:
+                    MYSQL_HOST: 127.0.0.1
diff --git a/.github/workflows/lint-check.yml b/.github/workflows/lint-check.yml
@@ -11,4 +11,4 @@ jobs:
                 uses: actions/checkout@v2
 
             -   name: Checking PHP Syntax
-                uses: TheDragonCode/php-codestyler@v1.10.8
+                uses: TheDragonCode/php-codestyler@v1.8.6
diff --git a/.github/workflows/lint-fixer.yml b/.github/workflows/lint-fixer.yml
@@ -13,6 +13,6 @@ jobs:
                 uses: actions/checkout@v2
 
             -   name: Checking PHP Syntax
-                uses: TheDragonCode/php-codestyler@v1.10.8
+                uses: TheDragonCode/php-codestyler@v1.8.6
                 with:
                     fix: true
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/composer.json b/composer.json
@@ -1,8 +1,8 @@
 {
     "name": "cashier-provider/cash",
     "description": "Driver for managing cash payments (see cashier-provider/core)",
-    "type": "library",
     "license": "MIT",
+    "type": "library",
     "keywords": [
         "bank",
         "billing",
@@ -20,18 +20,20 @@
         "source": "https://github.com/cashier-provider/cash"
     },
     "require": {
-        "php": "^7.3|^8.0",
-        "cashier-provider/core": "^2.0",
+        "php": "^7.3 || ^8.0",
+        "cashier-provider/core": "^2.5",
         "psr/http-message": "^1.0"
     },
     "require-dev": {
         "ext-json": "*",
         "dragon-code/support": "^5.0",
-        "illuminate/database": "^6.0|^7.0|^8.0",
-        "orchestra/testbench": "^4.0|^5.0|^6.0",
+        "illuminate/database": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0",
         "phpunit/phpunit": "^9.0",
-        "symfony/var-dumper": "^4.0|^5.0"
+        "symfony/var-dumper": "^4.0 || ^5.0 || ^6.0"
     },
+    "minimum-stability": "stable",
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "CashierProvider\\Cash\\": "src"
@@ -45,7 +47,5 @@
     "config": {
         "preferred-install": "dist",
         "sort-packages": true
-    },
-    "minimum-stability": "stable",
-    "prefer-stable": true
+    }
 }