Skip to content

Commit 521ba0e

Browse files
authored
Merge pull request #136 from laravel-shift/l11-compatibility
Laravel 11.x Compatibility
2 parents 11eae51 + 2210f1f commit 521ba0e

File tree

2 files changed

+13
-22
lines changed

2 files changed

+13
-22
lines changed

.github/workflows/run-tests.yml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
11
name: Tests
22

3-
on: [push, pull_request]
3+
on:
4+
- push
5+
- pull_request
46

57
jobs:
68
test:
79
runs-on: ${{ matrix.os }}
10+
811
strategy:
912
fail-fast: true
1013
matrix:
1114
os: [ubuntu-latest, windows-latest]
12-
php: [8.0, 8.1, 8.2]
13-
laravel: [10.*, 9.*, 8.*]
15+
php: [8.2, 8.3]
16+
laravel: ['10.*', '11.*']
1417
dependency-version: [prefer-lowest, prefer-stable]
1518
include:
1619
- laravel: 10.*
1720
testbench: 8.*
18-
phpunit: 9.6.*
19-
- laravel: 9.*
20-
testbench: 7.*
21-
phpunit: 9.5.*
22-
- laravel: 8.*
23-
testbench: 6.*
24-
phpunit: 9.4.*
25-
exclude:
26-
- laravel: 10.*
27-
php: 8.0
21+
- laravel: 11.*
22+
testbench: 9.*
2823

2924
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
3025

@@ -39,13 +34,9 @@ jobs:
3934
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
4035
coverage: none
4136

42-
- name: Configure for PHP 8.2
43-
run: composer config platform.php 8.1.99
44-
if: matrix.php == '8.2'
45-
4637
- name: Install dependencies
4738
run: |
48-
composer require "phpunit/phpunit:${{ matrix.phpunit }}" "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
39+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
4940
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
5041
5142
- name: Execute tests

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
],
1818
"require": {
1919
"php": "^8.0",
20-
"illuminate/contracts": "^8.70|^9.0|^10.0",
21-
"nesbot/carbon": "^2.63"
20+
"illuminate/contracts": "^10.0|^11.0",
21+
"nesbot/carbon": "^2.63|^3.0"
2222
},
2323
"require-dev": {
24-
"orchestra/testbench": "^6.25|^7.0|^8.0",
25-
"phpunit/phpunit": "^9.5.10"
24+
"orchestra/testbench": "^8.0|^9.0",
25+
"phpunit/phpunit": "^9.5.10|^10.5"
2626
},
2727
"autoload": {
2828
"psr-4": {

0 commit comments

Comments
 (0)