Skip to content

Commit

Permalink
Merge pull request #35 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 20, 2025
2 parents 68b7f14 + cc8d103 commit dc56f82
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,24 @@ name: run-tests
on:
push:
paths:
- '**.php'
- '.github/workflows/run-tests.yml'
- 'phpunit.xml.dist'
- 'composer.json'
- 'composer.lock'
- **.php
- .github/workflows/run-tests.yml
- phpunit.xml.dist
- composer.json
- composer.lock

jobs:
test:
runs-on: ${{ matrix.os }}

timeout-minutes: 5

strategy:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.3, 8.2]
laravel: [11.*]
laravel: ['11.*', '12.*']
stability: [prefer-lowest, prefer-stable]

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
],
"require": {
"php": "^8.2",
"laravel/framework": "^11.0"
"laravel/framework": "^11.0|^12.0"
},
"require-dev": {
"mockery/mockery": "^1.4",
"orchestra/testbench": "^9.0",
"pestphp/pest": "^2.0"
"orchestra/testbench": "^9.0|^10.0",
"pestphp/pest": "^2.0|^3.7"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit dc56f82

Please sign in to comment.