Skip to content

Commit 8ef6b44

Browse files
Laravel 11.x compatibility & tests (#721)
1 parent 62b0a63 commit 8ef6b44

File tree

2 files changed

+29
-19
lines changed

2 files changed

+29
-19
lines changed

.github/workflows/test.yml

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,23 @@ env:
99

1010
jobs:
1111
test:
12-
name: "Build"
12+
name: "Lara ${{ matrix.laravel }} PHP ${{ matrix.php }} Unit ${{ matrix.phpunit }}"
1313
runs-on: ubuntu-latest
1414
strategy:
15-
max-parallel: 12
15+
max-parallel: 6 # 12
1616
fail-fast: false
1717
matrix:
18-
php: ['7.4', '8.0', '8.1', '8.2']
19-
package-release: [dist]
18+
laravel: [9, 10, 11]
19+
php: ['8.1', '8.2', '8.3']
20+
phpunit: [9, 10]
21+
exclude:
22+
- {laravel: 11, php: '8.1'}
23+
- {laravel: 9, phpunit: 10}
24+
- {phpunit: 9}
25+
include:
26+
- {laravel: 9, php: '8.1', phpunit: 9}
27+
- {laravel: 9, php: '8.2', phpunit: 9}
28+
- {laravel: 9, php: '8.3', phpunit: 9}
2029
steps:
2130
- name: Checkout repository
2231
uses: actions/checkout@v3
@@ -37,21 +46,21 @@ jobs:
3746
uses: actions/cache@v3
3847
with:
3948
path: ${{ steps.composer-cache.outputs.dir }}
40-
key: composer-${{ runner.os }}-${{ matrix.php }}-${{ matrix.package-release }}-${{ hashFiles('**/composer.json') }}
49+
key: composer-${{ runner.os }}-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }}
4150
restore-keys: |
42-
composer-${{ runner.os }}-${{ matrix.php }}-${{ matrix.package-release }}-${{ env.cache-name }}-
43-
composer-${{ runner.os }}-${{ matrix.php }}-${{ matrix.package-release }}-
51+
composer-${{ runner.os }}-${{ matrix.php }}-${{ matrix.laravel }}-${{ env.cache-name }}-
52+
composer-${{ runner.os }}-${{ matrix.php }}-${{ matrix.laravel }}-
4453
composer-${{ runner.os }}-${{ matrix.php }}-
4554
composer-${{ runner.os }}-
4655
4756
- name: Install composer dependencies
48-
run: composer install --no-progress --no-interaction --prefer-${{ matrix.package-release }}
57+
run: composer require --no-progress --no-interaction illuminate/database:^${{ matrix.laravel }}.0 illuminate/validation:^${{ matrix.laravel }}.0 phpunit/phpunit:^${{ matrix.phpunit }}.0
4958

5059
- name: Run unit tests
5160
run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
5261

53-
- name: Upload to Scrutinizer
54-
continue-on-error: true
55-
run: |
56-
composer global require scrutinizer/ocular
57-
~/.composer/vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
62+
# - name: Upload to Scrutinizer
63+
# continue-on-error: true
64+
# run: |
65+
# composer global require scrutinizer/ocular
66+
# ~/.composer/vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover

composer.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "kris/laravel-form-builder",
33
"description": "Laravel form builder - symfony like",
4-
"keywords": ["laravel", "form", "builder","symfony"],
4+
"keywords": ["laravel", "form", "builder", "symfony"],
55
"license": "MIT",
66
"authors": [
77
{
@@ -10,13 +10,14 @@
1010
}
1111
],
1212
"require": {
13-
"php": ">=7.4",
14-
"laravelcollective/html": "^6",
15-
"illuminate/database": "^6 || ^7 || ^8 || ^9 || ^10",
16-
"illuminate/validation": "^6 || ^7 || ^8 || ^9 || ^10"
13+
"php": "^8.0",
14+
"rdx/laravelcollective-html": "^6",
15+
"illuminate/database": "^6 || ^7 || ^8 || ^9 || ^10 || ^11",
16+
"illuminate/validation": "^6 || ^7 || ^8 || ^9 || ^10 || ^11"
1717
},
1818
"require-dev": {
19-
"orchestra/testbench": "^6.13 || ^7.0 || ^8"
19+
"orchestra/testbench": "^6.13 || ^7 || ^8 || ^9",
20+
"phpunit/phpunit": "^10.0"
2021
},
2122
"extra": {
2223
"branch-alias": {

0 commit comments

Comments
 (0)