Skip to content

Commit 1b68320

Browse files
authored
Merge pull request #3 from justbetter/feature/laravel12
Support Laravel 12
2 parents 46957f5 + c15b6d2 commit 1b68320

File tree

4 files changed

+92
-7
lines changed

4 files changed

+92
-7
lines changed

.github/workflows/analyse.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: analyse
2+
3+
on: ['push', 'pull_request']
4+
5+
jobs:
6+
test:
7+
runs-on: ${{ matrix.os }}
8+
strategy:
9+
fail-fast: true
10+
matrix:
11+
os: [ubuntu-latest]
12+
php: [8.3, 8.4]
13+
laravel: [11.*]
14+
stability: [prefer-stable]
15+
include:
16+
- laravel: 11.*
17+
testbench: 9.*
18+
19+
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
20+
21+
steps:
22+
- name: Checkout code
23+
uses: actions/checkout@v4
24+
25+
- name: Setup PHP
26+
uses: shivammathur/setup-php@v2
27+
with:
28+
php-version: ${{ matrix.php }}
29+
extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
30+
coverage: none
31+
32+
- name: Install dependencies
33+
env:
34+
COMPOSER_AUTH: '{"http-basic":{"nova.laravel.com":{"username":"${{secrets.NOVA_USERNAME}}","password":"${{secrets.NOVA_PASSWORD}}"}}}'
35+
run: |
36+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
37+
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
38+
- name: Analyse
39+
run: composer analyse

.github/workflows/style.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: style
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
jobs:
8+
style:
9+
name: Style
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v4
15+
16+
- name: Setup PHP
17+
uses: shivammathur/setup-php@v2
18+
with:
19+
php-version: 8.4
20+
extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
21+
coverage: none
22+
23+
- name: Install dependencies
24+
env:
25+
COMPOSER_AUTH: '{"http-basic":{"nova.laravel.com":{"username":"${{secrets.NOVA_USERNAME}}","password":"${{secrets.NOVA_PASSWORD}}"}}}'
26+
run: composer install
27+
28+
- name: Style
29+
run: composer fix-style
30+
31+
- name: Commit Changes
32+
uses: stefanzweifel/git-auto-commit-action@v4
33+
with:
34+
commit_message: Fix styling changes

composer.json

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,30 @@
1717
}
1818
],
1919
"require": {
20-
"php": "^8.1",
20+
"php": "^8.3",
21+
"bolechen/nova-activitylog": "^0.5.0",
2122
"justbetter/laravel-akeneo-products": "^2.2",
22-
"laravel/nova": "^4.0"
23+
"laravel/framework": "^11.0|^12.0",
24+
"laravel/nova": "^5.0"
2325
},
2426
"require-dev": {
25-
"laravel/pint": "^1.10"
27+
"larastan/larastan": "^3.0",
28+
"laravel/pint": "^1.20",
29+
"orchestra/testbench": "^9.10"
2630
},
2731
"autoload": {
2832
"psr-4": {
2933
"JustBetter\\AkeneoProductsNova\\": "src"
3034
}
3135
},
3236
"scripts": {
33-
"analyse": "phpstan",
37+
"analyse": "phpstan --memory-limit=256M",
3438
"style": "pint --test",
3539
"quality": [
36-
"@analyse",
37-
"@style"
38-
]
40+
"@style",
41+
"@analyse"
42+
],
43+
"coverage": "XDEBUG_MODE=coverage php vendor/bin/pest --coverage --min=0"
3944
},
4045
"config": {
4146
"sort-packages": true,

phpstan.neon

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
includes:
2+
- ./vendor/larastan/larastan/extension.neon
3+
4+
parameters:
5+
paths:
6+
- src
7+
level: 1

0 commit comments

Comments
 (0)