Skip to content

Commit f359b1c

Browse files
authored
Merge pull request #27 from justbetter/feature/laravel12
Laravel 12 support
2 parents b8632d3 + 52415cb commit f359b1c

File tree

6 files changed

+21
-23
lines changed

6 files changed

+21
-23
lines changed

.github/workflows/analyse.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
os: [ubuntu-latest]
12-
php: [8.3]
13-
laravel: [ 11.*]
12+
php: [8.3, 8.4]
13+
laravel: [11.*]
1414
stability: [prefer-stable]
1515
include:
1616
- laravel: 11.*

.github/workflows/coverage.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
os: [ubuntu-latest]
12-
php: [8.3]
12+
php: [8.4]
1313
laravel: [11.*]
1414
stability: [prefer-stable]
1515
include:
@@ -31,8 +31,7 @@ jobs:
3131

3232
- name: Install dependencies
3333
run: |
34-
composer config allow-plugins.pestphp/pest-plugin true
3534
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
3635
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
3736
- name: Execute tests
38-
run: XDEBUG_MODE=coverage php vendor/bin/pest --coverage --min=100
37+
run: composer coverage

.github/workflows/style.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: 8.3
19+
php-version: 8.4
2020
extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
2121
coverage: none
2222

.github/workflows/tests.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,12 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
os: [ubuntu-latest]
12-
php: [8.2, 8.3]
12+
php: [8.3, 8.4]
1313
laravel: [11.*]
1414
stability: [prefer-stable]
1515
include:
1616
- laravel: 11.*
1717
testbench: 9.*
18-
exclude:
19-
- laravel: 11.*
20-
php: 8.1
2118

2219
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2320

composer.json

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
}
1212
],
1313
"require": {
14-
"php": "^8.2",
14+
"php": "^8.3",
1515
"justbetter/laravel-magento-async": "^1.0",
1616
"justbetter/laravel-magento-client": "^2.6.1",
1717
"justbetter/laravel-magento-products": "^1.4",
18-
"laravel/framework": "11.*",
18+
"laravel/framework": "^11.0|^12.0",
1919
"spatie/laravel-activitylog": "^4.7"
2020
},
2121
"require-dev": {
22-
"orchestra/testbench": "9.*",
2322
"doctrine/dbal": "^3.4",
24-
"larastan/larastan": "^2.9",
25-
"laravel/pint": "^1.6",
26-
"phpstan/phpstan-mockery": "^1.1",
27-
"phpunit/phpunit": "^10.0",
28-
"pestphp/pest": "^2.0"
23+
"larastan/larastan": "^3.0",
24+
"laravel/pint": "^1.20",
25+
"orchestra/testbench": "^9.0",
26+
"pestphp/pest": "^3.7",
27+
"phpstan/phpstan-mockery": "^2.0",
28+
"phpunit/phpunit": "^11.5"
2929
},
3030
"autoload": {
3131
"psr-4": {
@@ -39,14 +39,16 @@
3939
},
4040
"scripts": {
4141
"test": "phpunit",
42-
"analyse": "phpstan",
42+
"analyse": "phpstan --memory-limit=256M",
4343
"style": "pint --test",
4444
"quality": [
45-
"@test",
45+
"@style",
4646
"@analyse",
47-
"@style"
47+
"@test",
48+
"@coverage"
4849
],
49-
"fix-style": "pint"
50+
"fix-style": "pint",
51+
"coverage": "XDEBUG_MODE=coverage php vendor/bin/pest --coverage --min=100"
5052
},
5153
"config": {
5254
"sort-packages": true,

src/Listeners/BulkOperationStatusListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function execute(BulkOperation $operation): void
2828
activity()
2929
->useLog('error')
3030
->withProperties([
31-
'status' => $operation->status?->name ?? 'unknown',
31+
'status' => $operation->status->name ?? 'unknown',
3232
'response' => $operation->response,
3333
])
3434
->log('Failed to update Magento stock for SKU: '.$stock->sku);

0 commit comments

Comments
 (0)