Skip to content

Commit

Permalink
Merge pull request #153 from laravel-shift/l12-compatibility
Browse files Browse the repository at this point in the history
Laravel 12.x Compatibility
  • Loading branch information
freekmurze authored Feb 21, 2025
2 parents dcb5abd + 0977c21 commit 5456a27
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,20 @@ jobs:
matrix:
os: [ubuntu-latest]
php: [8.4, 8.3, 8.2, 8.1]
laravel: ['10.*', '11.*']
laravel: ['10.*', '11.*', '12.*']
stability: [prefer-lowest, prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 11.*
testbench: 9.*
- laravel: 12.*
testbench: 10.*
exclude:
- laravel: 11.*
php: 8.1
- laravel: 12.*
php: 8.1

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

Expand Down Expand Up @@ -62,7 +66,7 @@ jobs:
- name: Install dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
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
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
],
"require": {
"php": "^8.1",
"illuminate/support": "^10.0|^11.0",
"illuminate/support": "^10.0|^11.0|^12.0",
"league/flysystem": "^3.0",
"spatie/db-dumper": "^3.3",
"spatie/laravel-package-tools": "^1.6",
"spatie/temporary-directory": "^2.0"
},
"require-dev": {
"mockery/mockery": "^1.4",
"orchestra/testbench": "^8.22.3|^9.0.4",
"pestphp/pest-plugin-laravel": "^2.4",
"phpunit/phpunit": "^10.5"
"orchestra/testbench": "^8.22.3|^9.0.4|^10.0",
"pestphp/pest-plugin-laravel": "^2.4|^3.1",
"phpunit/phpunit": "^10.5|^11.5.3"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 5456a27

Please sign in to comment.