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

Added Laravel 9 support
cashbox-laravel · Feb 14, 2022 · b97827a · b97827a
2 parents d63def6 + 9f89218
commit b97827a
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 72 deletions.
diff --git a/.github/workflows/laravel-9.yml b/.github/workflows/laravel-9.yml
@@ -0,0 +1,49 @@
+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: Store environment variables
+                run: |
+                    echo "CASHIER_TINKOFF_CLIENT_ID=${{ secrets.CASHIER_TINKOFF_CLIENT_ID }}" >> .env
+                    echo "CASHIER_TINKOFF_CLIENT_SECRET=${{ secrets.CASHIER_TINKOFF_CLIENT_SECRET }}" >> .env
+
+            -   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
+                    PGSQL_HOST: 127.0.0.1
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/composer.json b/composer.json
@@ -26,17 +26,17 @@
     },
     "require": {
         "php": "^7.3 || ^8.0",
-        "cashier-provider/core": "^2.1",
-        "cashier-provider/tinkoff-auth": "^2.0",
+        "cashier-provider/core": "^2.5",
+        "cashier-provider/tinkoff-auth": "^2.1",
         "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,
@@ -51,6 +51,9 @@
         }
     },
     "config": {
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true
+        },
         "preferred-install": "dist",
         "sort-packages": true
     }