Skip to content

Commit e1d0c60

Browse files
owenvokeowenvoke
authored
Merge pull request #21 from worksome/feature/laravel-12
feat: add support for Laravel 12
2 parents 89771d1 + 2a61188 commit e1d0c60

20 files changed

+152
-106
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +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
21+
/docker export-ignore
22+
/docker-compose.yml export-ignore

‎.github/workflows/dependabot-auto-merge.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Dependabot Auto Merge
1+
name: Dependabot Auto-Merge
22
on: pull_request_target
33

44
permissions:
@@ -18,15 +18,15 @@ jobs:
1818
github-token: "${{ secrets.GITHUB_TOKEN }}"
1919

2020
- name: Auto-merge Dependabot PRs for semver-minor updates
21-
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
21+
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-minor' }}
2222
run: gh pr merge --auto --merge "$PR_URL"
2323
env:
24-
PR_URL: ${{github.event.pull_request.html_url}}
25-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
24+
PR_URL: ${{ github.event.pull_request.html_url }}
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2626

2727
- name: Auto-merge Dependabot PRs for semver-patch updates
28-
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
28+
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' }}
2929
run: gh pr merge --auto --merge "$PR_URL"
3030
env:
31-
PR_URL: ${{github.event.pull_request.html_url}}
32-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
31+
PR_URL: ${{ github.event.pull_request.html_url }}
32+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/static.yml‎

Lines changed: 22 additions & 1 deletion
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‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,20 @@ 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

27-
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
25+
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2826

2927
steps:
3028
- name: Checkout code
@@ -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‎

Lines changed: 9 additions & 8 deletions
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
410
.phpunit.cache
5-
build
6-
composer.lock
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

‎CHANGELOG.md‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ composer test
8282

8383
## Changelog
8484

85-
Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed recently.
85+
Please see [GitHub Releases](https://github.com/worksome/laravel-mfa/releases) for more information on what has changed recently.
8686

8787
## Contributing
8888

‎composer.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^8.2",
19+
"php": "^8.3",
2020
"guzzlehttp/guzzle": "^7.8",
21-
"laravel/framework": "^10.0 || ^11.0",
21+
"laravel/framework": "^11.0 || ^12.0",
2222
"pragmarx/google2fa": "^8.0",
23-
"spatie/laravel-package-tools": "^1.16"
23+
"spatie/laravel-package-tools": "^1.19"
2424
},
2525
"require-dev": {
26-
"larastan/larastan": "^2.6",
27-
"nunomaduro/collision": "^7.0 || ^8.1",
28-
"orchestra/testbench": "^8.0 || ^9.0",
29-
"pestphp/pest": "^2.33",
30-
"pestphp/pest-plugin-laravel": "^2.2",
31-
"worksome/coding-style": "^2.10"
26+
"larastan/larastan": "^3.1",
27+
"nunomaduro/collision": "^7.10 || ^8.1.1",
28+
"orchestra/testbench": "^9.12 || ^10.1",
29+
"pestphp/pest": "^3.7",
30+
"pestphp/pest-plugin-laravel": "^3.1",
31+
"worksome/coding-style": "^3.2"
3232
},
3333
"autoload": {
3434
"psr-4": {

‎docker-compose.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
services:
2+
php:
3+
build: ./docker
4+
volumes:
5+
- .:/var/www/html
6+
environment:
7+
- XDEBUG_MODE=${XDEBUG_MODE:-off}
8+
- XDEBUG_CONFIG=${XDEBUG_CONFIG:-client_host=host.docker.internal}
9+
composer:
10+
build: ./docker
11+
entrypoint: ["composer"]
12+
volumes:
13+
- .:/var/www/html

0 commit comments

Comments
 (0)