Skip to content

Commit 7abbab7

Browse files
authored
Laravel 8 support (#2547)
1 parent 8636a5a commit 7abbab7

File tree

5 files changed

+381
-19
lines changed

5 files changed

+381
-19
lines changed

.github/workflows/tests.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,22 @@ jobs:
1414
strategy:
1515
matrix:
1616
php: [7.4, 7.3, 7.2]
17-
laravel: [7.*, 6.*]
17+
laravel: [8.*, 7.*, 6.*]
1818
dependency-version: [prefer-lowest, prefer-stable]
1919
os: [ubuntu-latest]
2020
include:
21+
- laravel: 8.*
22+
testbench: 6.*
2123
- laravel: 7.*
2224
testbench: 5.*
2325
- laravel: 6.*
2426
testbench: 4.*
2527
- php: 7.4
2628
dependency-version: prefer-lowest
2729
additional-deps: '"mockery/mockery:>=1.2.3"'
30+
exclude:
31+
- laravel: 8.*
32+
php: 7.2
2833

2934
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
3035

composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"require": {
1212
"composer/composer": "^1.10",
1313
"facade/ignition-contracts": "^1.0",
14-
"guzzlehttp/guzzle": "^6.3",
15-
"laravel/framework": "^6.0 || ^7.0",
14+
"guzzlehttp/guzzle": "^6.3 || ^7.0",
15+
"laravel/framework": "^6.0 || ^7.0 || ^8.0",
1616
"laravel/helpers": "^1.1",
1717
"league/commonmark": "^1.5",
1818
"league/csv": "^9.0",
@@ -22,7 +22,6 @@
2222
"statamic/stringy": "^3.1",
2323
"symfony/var-exporter": "^4.3",
2424
"symfony/yaml": "^4.1 || ^5.1",
25-
"twistor/flysystem-guzzle": "^6.0",
2625
"ueberdosis/html-to-prosemirror": "^1.0",
2726
"ueberdosis/prosemirror-to-html": "^2.0",
2827
"wilderborn/partyline": "^1.0"
@@ -31,7 +30,7 @@
3130
"fzaninotto/faker": "~1.4",
3231
"google/cloud-translate": "^1.6",
3332
"mockery/mockery": "^1.2.3",
34-
"orchestra/testbench": "^4.0 || ^5.0"
33+
"orchestra/testbench": "^4.0 || ^5.0 || ^6.0"
3534
},
3635
"config": {
3736
"optimize-autoloader": true,

0 commit comments

Comments
 (0)