Skip to content

Commit 7415d36

Browse files
authored
Merge pull request #20 from ellgreen/laravel-12
Laravel 12
2 parents 976dd2a + 8eacee1 commit 7415d36

36 files changed

+1672
-731
lines changed

.github/workflows/test.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
with:
1414
php-version: "8.2"
1515
- run: composer install --no-interaction --prefer-dist
16-
- run: vendor/bin/phpcs
16+
- run: vendor/bin/pint --test
1717

1818
phpstan:
1919
runs-on: ubuntu-latest
@@ -28,14 +28,12 @@ jobs:
2828
phpunit:
2929
strategy:
3030
matrix:
31-
php: [8.3, 8.2]
32-
laravel: ["10.*", "11.*"]
31+
php: [8.2, 8.3, 8.4]
32+
laravel: ["12.*"]
3333
os: [ubuntu-latest]
3434
include:
35-
- laravel: 10.*
36-
testbench: ^8.0
37-
- laravel: 11.*
38-
testbench: ^9.0
35+
- laravel: 12.*
36+
testbench: ^10.0
3937
runs-on: ${{ matrix.os }}
4038
name: phpunit (P${{ matrix.php }} - L${{ matrix.laravel }})
4139
env:
@@ -55,4 +53,4 @@ jobs:
5553
- run: |
5654
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
5755
composer update --no-interaction --prefer-dist
58-
- run: vendor/bin/phpunit
56+
- run: vendor/bin/pest

.zed/settings.json

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Folder-specific settings
2+
//
3+
// For a full list of overridable settings, and general information on folder-specific settings,
4+
// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
5+
{
6+
"languages": {
7+
"JSON": {
8+
"tab_size": 4
9+
}
10+
}
11+
}

README.md

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

2424
## Installation
2525

26-
**Requires > PHP 8.1 and > Laravel 9**
26+
**Requires >= PHP 8.2 and >= Laravel 12**
2727

2828
*Older versions of Laravel and PHP are supported through previous major versions of this library*
2929

composer.json

+19-15
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,32 @@
2222
},
2323
"require": {
2424
"php": "^8.2",
25-
"illuminate/database": "^10.0|^11.0"
25+
"illuminate/database": "^12.0"
2626
},
2727
"require-dev": {
28-
"phpunit/phpunit": "^10.5",
29-
"orchestra/testbench": "^8.0|^9.0",
30-
"squizlabs/php_codesniffer": "^3.6",
31-
"larastan/larastan": "^2.0|^3.0"
28+
"orchestra/testbench": "^10.0",
29+
"larastan/larastan": "^3.0",
30+
"pestphp/pest": "^3.7",
31+
"laravel/pint": "^1.21"
3232
},
3333
"scripts": {
34-
"test-unit": "php ./vendor/bin/phpunit tests/Unit",
35-
"test-unit-coverage": "php ./vendor/bin/phpunit tests/Unit --coverage-html .coverage/unit",
34+
"lint": "@php ./vendor/bin/pint",
35+
"static": "@php ./vendor/bin/phpstan analyse",
36+
"test-unit": "@php ./vendor/bin/pest --colors=always tests/Unit",
37+
"test-unit-coverage": "@php ./vendor/bin/pest tests/Unit --coverage-html .coverage/unit",
3638
"check": [
39+
"@lint",
40+
"@static",
41+
"@test-unit"
42+
],
43+
"test": [
3744
"@docker-up",
38-
"@docker-laravel-test",
39-
"@docker-cs",
40-
"@docker-static-analysis"
45+
"@docker-laravel-test"
4146
],
4247
"docker-up": "docker compose up -d database",
43-
"docker-test": "docker compose run --rm app php ./vendor/bin/phpunit",
48+
"docker-test": "docker compose run --rm app php ./vendor/bin/pest",
4449
"docker-laravel-test": "docker compose run --rm app php tests/laravel/laravel-version-test.php",
45-
"docker-test-coverage": "docker compose run --rm app php ./vendor/bin/phpunit --coverage-html .coverage/all",
46-
"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/phpstan analyse"
50+
"docker-test-coverage": "docker compose run --rm app php ./vendor/bin/pest --coverage-html .coverage/all"
4851
},
4952
"extra": {
5053
"laravel": {
@@ -58,7 +61,8 @@
5861
},
5962
"config": {
6063
"allow-plugins": {
61-
"composer/package-versions-deprecated": true
64+
"composer/package-versions-deprecated": true,
65+
"pestphp/pest-plugin": true
6266
}
6367
}
6468
}

0 commit comments

Comments
 (0)