Skip to content

Commit fe2b0dd

Browse files
Merge pull request #44 from laravel-shift/l10-compatibility
Laravel 10.x Compatibility
2 parents 3c7d670 + 9600805 commit fe2b0dd

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

.github/workflows/tests.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
php: [ 7.3, 7.4, 8.0, 8.1 ]
19-
laravel: [ 7.*, 8.*, 9.* ]
19+
laravel: [ 7.*, 8.*, 9.* , 10.*]
2020
dependency-version: [ prefer-lowest, prefer-stable ]
2121
include:
22+
- laravel: 10.*
23+
testbench: 8.*
2224
- laravel: 7.*
2325
testbench: 5.*
2426

@@ -29,6 +31,12 @@ jobs:
2931
testbench: 7.*
3032

3133
exclude:
34+
- laravel: 10.*
35+
php: 7.3
36+
- laravel: 10.*
37+
php: 7.4
38+
- laravel: 10.*
39+
php: 8.0
3240
- laravel: 9.*
3341
php: 7.3
3442

@@ -63,18 +71,14 @@ jobs:
6371

6472
- name: Install dependencies
6573
run: |
74+
composer config minimum-stability dev
6675
composer self-update
6776
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
6877
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
6978
7079
- name: Execute tests
7180
run: vendor/bin/phpunit
7281

73-
- name: Install Livewire V1
74-
if: "! startsWith(matrix.laravel, '9.')"
75-
run: |
76-
composer require "livewire/livewire:^1" --no-interaction
77-
7882
- name: Execute tests
7983
if: "! startsWith(matrix.laravel, '9.')"
8084
run: vendor/bin/phpunit

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
],
1818
"require": {
1919
"php": "^7.3|^8.0",
20-
"illuminate/support": "^7.26.0|^8.0|^9.0",
21-
"illuminate/console": "^7.26.0|^8.0|^9.0",
22-
"illuminate/http": "^7.26.0|^8.0|^9.0",
23-
"illuminate/cache": "^7.26.0|^8.0|^9.0",
24-
"illuminate/view": "^7.26.0|^8.0|^9.0",
20+
"illuminate/support": "^7.26.0|^8.0|^9.0|^10.0",
21+
"illuminate/console": "^7.26.0|^8.0|^9.0|^10.0",
22+
"illuminate/http": "^7.26.0|^8.0|^9.0|^10.0",
23+
"illuminate/cache": "^7.26.0|^8.0|^9.0|^10.0",
24+
"illuminate/view": "^7.26.0|^8.0|^9.0|^10.0",
2525
"guzzlehttp/guzzle": "^7.2",
2626
"ramsey/uuid": "^3.7|^4.0"
2727
},

0 commit comments

Comments
 (0)