Skip to content

Commit

Permalink
Merge pull request #41 from Sammyjo20/feature/v1-laravel-10
Browse files Browse the repository at this point in the history
Feature | Support Laravel 10
  • Loading branch information
Sammyjo20 committed Feb 14, 2023
2 parents 427f7f6 + b21ccd2 commit f113602
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/php-cs-fixer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
token: ${{ secrets.PHP_CS_FIXER }}
uses: actions/checkout@v3
- name: Run PHP CS Fixer
uses: docker://oskarstark/php-cs-fixer-ga
with:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.0, 8.1, 8.2]
laravel: [8.*, 9.*]
php: [8.1, 8.2]
laravel: [8.*, 9.*, 10.*]
stability: [prefer-lowest, prefer-stable]
include:
- laravel: 8.*
testbench: ^6.24
- laravel: 9.*
testbench: 7.*
- laravel: 10.*
testbench: 8.*

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

Expand All @@ -37,7 +39,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, bcmath, intl, gd, exif, iconv, fileinfo
coverage: none

- name: Setup problem matchers
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
],
"homepage": "https://github.com/sammyjo20/saloon-laravel",
"require": {
"php": "^8.0",
"illuminate/console": "^8.0 || ^9.0",
"illuminate/support": "^8.0 || ^9.0",
"sammyjo20/saloon": "^1.6"
"php": "^8.1",
"illuminate/console": "^8.0 || ^9.0 || ^10.0",
"illuminate/support": "^8.0 || ^9.0 || ^10.0",
"sammyjo20/saloon": "^1.6.2"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.5",
"orchestra/testbench": "^6.24 || ^7.7",
"orchestra/testbench": "^6.24 || ^7.7 || ^8.0",
"pestphp/pest": "^1.21"
},
"minimum-stability": "stable",
Expand Down

0 comments on commit f113602

Please sign in to comment.