Skip to content

Commit 86ee39b

Browse files
owenvokeowenvoke
committed
feat: add support for Laravel 12
1 parent c4a47b1 commit 86ee39b

File tree

10 files changed

+73
-51
lines changed

10 files changed

+73
-51
lines changed

‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ root = true
22

33
[*]
44
charset = utf-8
5+
end_of_line = lf
56
indent_size = 4
67
indent_style = space
7-
end_of_line = lf
88
insert_final_newline = true
99
trim_trailing_whitespace = true
1010

‎.gitattributes

+18-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
# Path-based git attributes
2-
# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
2+
# https://git-scm.com/docs/gitattributes
3+
* text=auto
34

45
# Ignore all test and documentation with "export-ignore".
5-
/.github export-ignore
6-
/.gitattributes export-ignore
7-
/.gitignore export-ignore
8-
/phpunit.xml.dist export-ignore
9-
/art export-ignore
10-
/docs export-ignore
11-
/tests export-ignore
12-
/.editorconfig export-ignore
13-
/.php_cs.dist.php export-ignore
14-
/psalm.xml export-ignore
15-
/psalm.xml.dist export-ignore
16-
/testbench.yaml export-ignore
17-
/UPGRADING.md export-ignore
18-
/phpstan.neon.dist export-ignore
6+
/.github export-ignore
7+
/.gitattributes export-ignore
8+
/.gitignore export-ignore
9+
/phpunit.xml.dist export-ignore
10+
/art export-ignore
11+
/docs export-ignore
12+
/tests export-ignore
13+
/.editorconfig export-ignore
14+
/.php_cs.dist.php export-ignore
15+
/psalm.xml export-ignore
16+
/psalm.xml.dist export-ignore
17+
/testbench.yaml export-ignore
18+
/UPGRADING.md export-ignore
19+
/phpstan.neon.dist export-ignore
1920
/phpstan-baseline.neon export-ignore
20-
/docker export-ignore
21-
/docker-compose.yml export-ignore
21+
/docker export-ignore
22+
/docker-compose.yml export-ignore

‎.github/workflows/static.yml

+22-1
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,32 @@ jobs:
1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: '8.2'
19+
php-version: '8.3'
2020
coverage: none
2121

2222
- name: Install composer dependencies
2323
uses: ramsey/composer-install@v3
2424

2525
- name: Run PHPStan
2626
run: composer test:types
27+
28+
ecs:
29+
name: ECS
30+
31+
runs-on: ubuntu-latest
32+
33+
steps:
34+
- name: Checkout
35+
uses: actions/checkout@v4
36+
37+
- name: Setup PHP
38+
uses: shivammathur/setup-php@v2
39+
with:
40+
php-version: '8.3'
41+
coverage: none
42+
43+
- name: Install Dependencies
44+
run: composer update --prefer-dist --no-interaction --no-progress --ansi
45+
46+
- name: Run ECS
47+
run: composer test:style

‎.github/workflows/tests.yml

+6-9
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,16 @@ on:
99
jobs:
1010
test:
1111
runs-on: ${{ matrix.os }}
12-
env:
13-
PREVENT_OUTPUT: true
1412
strategy:
1513
fail-fast: true
1614
matrix:
1715
os: [ubuntu-latest]
18-
php: [8.2, 8.3]
19-
laravel: [10.*, 11.*]
16+
php: [8.4, 8.3]
17+
laravel: [12.*, 11.*]
2018
stability: [prefer-lowest, prefer-stable]
2119
include:
22-
- laravel: 10.*
23-
testbench: 8.*
20+
- laravel: 12.*
21+
testbench: 10.*
2422
- laravel: 11.*
2523
testbench: 9.*
2624

@@ -34,7 +32,6 @@ jobs:
3432
uses: shivammathur/setup-php@v2
3533
with:
3634
php-version: ${{ matrix.php }}
37-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
3835
coverage: none
3936

4037
- name: Setup problem matchers
@@ -44,8 +41,8 @@ jobs:
4441
4542
- name: Install dependencies
4643
run: |
47-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
48-
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
44+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --ansi
45+
composer update --${{ matrix.stability }} --prefer-dist --no-interaction --ansi
4946
5047
- name: Execute tests
5148
run: composer test:unit

‎.gitignore

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
.idea
1+
/.idea
2+
/build
3+
/vendor
4+
/.php_cs.cache
5+
/composer.lock
6+
/phpunit.xml
7+
/phpstan.neon
28
.php_cs
39
.php_cs.cache
4-
.phpunit.result.cache
5-
build
6-
composer.lock
10+
.phpunit.cache
11+
.php-cs-fixer.cache
712
coverage
813
docs
9-
phpunit.xml
10-
phpstan.neon
11-
testbench.yaml
12-
vendor
1314
node_modules
14-
.php-cs-fixer.cache
15+
testbench.yaml

‎composer.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^8.2",
20-
"spatie/laravel-package-tools": "^1.16",
21-
"illuminate/contracts": "^10.0 || ^11.0"
19+
"php": "^8.3",
20+
"illuminate/contracts": "^11.0 || ^12.0",
21+
"spatie/laravel-package-tools": "^1.19"
2222
},
2323
"require-dev": {
24-
"nunomaduro/collision": "^7.0 || ^8.1",
25-
"larastan/larastan": "^2.6",
26-
"orchestra/testbench": "^8.0.8 || ^9.0",
27-
"pestphp/pest": "^2.33",
28-
"pestphp/pest-plugin-laravel": "^2.2",
29-
"worksome/coding-style": "^2.8"
24+
"larastan/larastan": "^3.1",
25+
"nunomaduro/collision": "^7.10 || ^8.1.1",
26+
"orchestra/testbench": "^9.12 || ^10.1",
27+
"pestphp/pest": "^3.7",
28+
"pestphp/pest-plugin-laravel": "^3.1",
29+
"worksome/coding-style": "^3.2"
3030
},
3131
"autoload": {
3232
"psr-4": {

‎docker-compose.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3.8"
2-
31
services:
42
php:
53
build: ./docker

‎docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.2-cli-alpine
1+
FROM php:8.3-cli-alpine
22

33
RUN apk add --no-cache $PHPIZE_DEPS linux-headers
44
RUN pecl install xdebug

‎ecs.php

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use Symplify\EasyCodingStandard\Config\ECSConfig;
66
use Worksome\CodingStyle\WorksomeEcsConfig;
77

8-
98
return static function (ECSConfig $ecsConfig): void {
109
$ecsConfig->paths([
1110
__DIR__ . '/src',

‎phpunit.xml.dist

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@
77
cacheDirectory=".phpunit.cache"
88
>
99
<testsuites>
10-
<testsuite name="Worksome Test Suite">
10+
<testsuite name="Test Suite">
1111
<directory>tests</directory>
1212
</testsuite>
1313
</testsuites>
14+
<source>
15+
<include>
16+
<directory suffix=".php">./src</directory>
17+
</include>
18+
</source>
1419
</phpunit>

0 commit comments

Comments
 (0)