Skip to content

Commit 4723ce0

Browse files
authored
Merge pull request #16 from matteoc99/feature/v12_tests
feat:
2 parents 048f9e4 + 850ab08 commit 4723ce0

File tree

5 files changed

+18
-19
lines changed

5 files changed

+18
-19
lines changed

.github/workflows/coverage.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,18 @@ jobs:
1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: 8.2
19+
php-version: 8.3
2020
extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv, xdebug
2121
coverage: xdebug
2222
- name: Install dependencies
2323
run: |
24-
composer require "laravel/framework:^10.0" "orchestra/testbench:8.*"
24+
composer require "laravel/framework:^11.0" "orchestra/testbench:9.*"
2525
composer update
2626
- name: Execute tests
2727
run: php -d xdebug.mode=coverage vendor/bin/phpunit ./tests --coverage-clover='reports/coverage/coverage.xml'
2828
- name: Upload coverage reports to Codecov
29-
uses: codecov/codecov-action@v4.0.1
29+
uses: codecov/codecov-action@v5.4.2
3030
with:
3131
token: ${{ secrets.CODECOV_TOKEN }}
3232
slug: matteoc99/laravel-preference
3333
files: ./reports/coverage/coverage.xml
34-
- name: Running Pint
35-
run: composer pint-test

.github/workflows/tests.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,20 @@ on:
88

99
jobs:
1010
test:
11-
1211
runs-on: ubuntu-latest
1312
strategy:
1413
fail-fast: false
1514
matrix:
16-
php: [ 8.3, 8.2, 8.1 ]
17-
laravel: [ "^11.0", "^10.0" ]
15+
php: [ 8.3, 8.2]
16+
laravel: [ "^12.0", "^11.0", "^10.0" ]
1817
include_security: [ true, false ]
1918
include:
19+
- laravel: "^12.0"
20+
testbench: "^10.0"
2021
- laravel: "^11.0"
2122
testbench: "^9.0"
2223
- laravel: "^10.0"
2324
testbench: "^8.0"
24-
exclude:
25-
- laravel: "^11.0"
26-
php: 8.1
2725

2826
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.include_security && 'With Security' || 'Without Security' }}
2927

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
/.phpunit.result.cache
55
/.idea/php-test-framework.xml
66
/.idea/inspectionProfiles/Project_Default.xml
7+
/.idea/codeStyles/codeStyleConfig.xml
8+
/.idea/statistic.xml

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ This Laravel package aims to store and manage user settings/preferences in a sim
5858
- Blade Directives
5959

6060

61-
6261
- Additional suggestions are welcome. (check out [Contributing](#contributing))
6362

6463
## Installation
@@ -728,7 +727,8 @@ The MIT License (MIT). Please check the [License File](LICENSE) for more informa
728727

729728
## Support target
730729

731-
| Package Version | Laravel Version | Maintained |
732-
|-----------------|-----------------|------------|
733-
| 1.x | 10 ||
734-
| 2.x | 10 & 11 ||
730+
| Package Version | Laravel Version | PHP | Maintained |
731+
|-----------------|-----------------|-------|------------|
732+
| 1.x | 10 | >=8.1 ||
733+
| 2.0 & 2.1 | 10 & 11 | >=8.1 ||
734+
| ^2.2 | 10 & 11 & 12 | >=8.2 ||

composer.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"test": "vendor/bin/phpunit",
2525
"pint-test": "vendor/bin/pint --config pint.json --test",
2626
"pint": "vendor/bin/pint --config pint.json",
27-
"pipeline": "gh act -W '.github/workflows/tests.yml'",
27+
"pipeline-tests": "gh act -W '.github/workflows/tests.yml'",
28+
"pipeline-coverage": "gh act -W '.github/workflows/coverage.yml'",
2829
"coverage": "php -d xdebug.mode=coverage vendor/bin/phpunit ./tests --coverage-clover='reports/coverage/coverage.xml' --coverage-html='reports/coverage'"
2930
},
3031
"minimum-stability": "dev",
@@ -39,8 +40,8 @@
3940
"graham-campbell/security-core": "Required to use xss cleaning.(^4.0)"
4041
},
4142
"require-dev": {
42-
"orchestra/testbench": "^9.0",
43-
"phpunit/phpunit": "^10.0",
43+
"orchestra/testbench": "^9.0 || ^10",
44+
"phpunit/phpunit": "^10 || ^11",
4445
"laravel/pint": "^1.15"
4546
},
4647
"extra": {

0 commit comments

Comments
 (0)