Skip to content

Commit

Permalink
Merge pull request #37 from laravel-shift/l11-compatibility
Browse files Browse the repository at this point in the history
Laravel 11.x Compatibility
  • Loading branch information
freekmurze authored Feb 28, 2024
2 parents d52f40d + e7dafa6 commit 604abcd
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,31 @@ name: run-tests

on:
push:
branches: [main]
branches:
- main
pull_request:
branches: [main]
branches:
- main

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

strategy:
fail-fast: true
matrix:
os: [ubuntu-latest]
php: [8.1]
laravel: [9.*]
php: [8.1, '8.2']
laravel: ['9.*', '11.*']
stability: [prefer-lowest, prefer-stable]
include:
- laravel: 9.*
testbench: 7.*
- laravel: 11.*
testbench: 9.*
exclude:
- laravel: 11.*
php: 8.1

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

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
],
"require": {
"php": "^8.1",
"illuminate/contracts": "^10.0",
"illuminate/http": "^10.0",
"illuminate/contracts": "^10.0|^11.0",
"illuminate/http": "^10.0|^11.0",
"open-telemetry/api": "^1.0",
"open-telemetry/sdk": "^1.0",
"php-http/guzzle7-adapter": "^1.0",
"spatie/laravel-package-tools": "^1.13.8"
},
"require-dev": {
"laravel/pint": "^1.3",
"nunomaduro/collision": "^7.0",
"nunomaduro/collision": "^7.0|^8.0",
"nunomaduro/larastan": "^2.3.4",
"orchestra/testbench": "^8.0",
"orchestra/testbench": "^8.0|^9.0",
"pestphp/pest": "^2.0",
"pestphp/pest-plugin-laravel": "^2.0",
"phpstan/extension-installer": "^1.2",
Expand Down

1 comment on commit 604abcd

@rivaisali
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cant wait

Please sign in to comment.