Skip to content

Commit

Permalink
Merge pull request #30 from worksome/l10
Browse files Browse the repository at this point in the history
chore(deps): Laravel 10 support
  • Loading branch information
lukeraymonddowning authored Feb 1, 2023
2 parents 83c9738 + 7e94b7c commit 24189c2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,13 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.2]
laravel: [9.*]
laravel: [9.*, 10.*]
stability: [prefer-stable]
include:
- laravel: 9.*
testbench: 7.*
- laravel: 10.*
testbench: 8.*

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

Expand All @@ -35,8 +40,9 @@ jobs:
echo "::add-matcher::${{ runner.tool_cache }}/php.json"
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
- name: Install dependencies
- name: Install Composer dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
- name: Execute tests
Expand Down
11 changes: 5 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,18 @@
],
"require": {
"php": "^8.2",
"illuminate/contracts": "^9.46",
"illuminate/contracts": "^9.46|^10.0",
"nikic/php-parser": "^4.15",
"nunomaduro/termwind": "^1.15",
"spatie/laravel-package-tools": "^1.13.8",
"spatie/laravel-package-tools": "^1.14.1",
"thecodingmachine/safe": "^2.4"
},
"require-dev": {
"nunomaduro/collision": "^6.4",
"nunomaduro/larastan": "^2.3.4",
"orchestra/testbench": "^7.17",
"nunomaduro/larastan": "^2.4.0",
"orchestra/testbench": "^7.17|^8.0",
"pestphp/pest": "^1.22",
"pestphp/pest-plugin-laravel": "^1.3",
"spatie/laravel-ray": "^1.31",
"pestphp/pest-plugin-laravel": "^1.4",
"worksome/coding-style": "^2.3.2"
},
"autoload": {
Expand Down

0 comments on commit 24189c2

Please sign in to comment.