Skip to content

Commit e9d8c0e

Browse files
authored
Merge pull request #12 from ellgreen/laravel-10
Add Laravel 10 and drop PHP 8.0 support
2 parents bbac012 + 38dbd84 commit e9d8c0e

File tree

7 files changed

+1835
-1422
lines changed

7 files changed

+1835
-1422
lines changed

.github/workflows/test.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,32 @@ jobs:
99
- uses: actions/checkout@v2
1010
- uses: shivammathur/setup-php@v2
1111
with:
12-
php-version: '8.0'
12+
php-version: '8.1'
1313
- run: composer install --no-interaction --prefer-dist
1414
- run: vendor/bin/phpcs
1515

16-
psalm:
16+
phpstan:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v2
2020
- uses: shivammathur/setup-php@v2
2121
with:
22-
php-version: '8.0'
22+
php-version: '8.1'
2323
- run: composer install --no-interaction --prefer-dist
24-
- run: vendor/bin/psalm
24+
- run: vendor/bin/phpstan analyse
2525

2626
phpunit:
27-
runs-on: ${{ matrix.os }}
2827
strategy:
2928
matrix:
30-
php: [ 8.0, 8.1 ]
31-
laravel: [ 9.*, 8.* ]
29+
php: [ 8.2, 8.1 ]
30+
laravel: [ 10.*, 9.* ]
3231
os: [ ubuntu-latest ]
3332
include:
33+
- laravel: 10.*
34+
testbench: ^8.0
3435
- laravel: 9.*
3536
testbench: ^7.0
36-
- laravel: 8.*
37-
testbench: ^6.0
37+
runs-on: ${{ matrix.os }}
3838
name: phpunit (P${{ matrix.php }} - L${{ matrix.laravel }})
3939
env:
4040
DB_HOST: 127.0.0.1

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ https://dev.mysql.com/doc/refman/8.0/en/load-data.html
2323

2424
## Installation
2525

26-
**Requires > PHP 8.0 and > Laravel 8**
26+
**Requires > PHP 8.1 and > Laravel 9**
27+
28+
*Older versions of Laravel and PHP are supported through previous major versions of this library*
2729

2830
```bash
2931
composer require ellgreen/laravel-loadfile

composer.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@
2121
}
2222
},
2323
"require": {
24-
"php": "^8.0",
25-
"illuminate/database": "^8.0|^9.0"
24+
"php": "^8.1",
25+
"illuminate/database": "^9.0|^10.0"
2626
},
2727
"require-dev": {
2828
"phpunit/phpunit": "^9",
29-
"orchestra/testbench": "^6.0|^7.0",
29+
"orchestra/testbench": "^7.0|^8.0",
3030
"squizlabs/php_codesniffer": "^3.6",
31-
"vimeo/psalm": "^4.7"
31+
"vimeo/psalm": "^4.7",
32+
"nunomaduro/larastan": "^2.0"
3233
},
3334
"scripts": {
3435
"test-unit": "php ./vendor/bin/phpunit tests/Unit",
@@ -44,7 +45,7 @@
4445
"docker-laravel-test": "docker compose run --rm app php tests/laravel/laravel-version-test.php",
4546
"docker-test-coverage": "docker compose run --rm app php ./vendor/bin/phpunit --coverage-html .coverage/all",
4647
"docker-cs": "docker compose run --rm app php ./vendor/bin/phpcs --standard=PSR12 src/",
47-
"docker-static-analysis": "docker compose run --rm app php ./vendor/bin/psalm"
48+
"docker-static-analysis": "docker compose run --rm app php ./vendor/bin/phpstan analyse"
4849
},
4950
"extra": {
5051
"laravel": {

0 commit comments

Comments
 (0)