Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laravel 12 support #27

Merged
merged 2 commits into from
Feb 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/analyse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
php: [8.3]
laravel: [ 11.*]
php: [8.3, 8.4]
laravel: [11.*]
stability: [prefer-stable]
include:
- laravel: 11.*
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
php: [8.3]
php: [8.4]
laravel: [11.*]
stability: [prefer-stable]
include:
Expand All @@ -31,8 +31,7 @@ jobs:

- name: Install dependencies
run: |
composer config allow-plugins.pestphp/pest-plugin true
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
- name: Execute tests
run: XDEBUG_MODE=coverage php vendor/bin/pest --coverage --min=100
run: composer coverage
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3
php-version: 8.4
extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
coverage: none

Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
php: [8.2, 8.3]
php: [8.3, 8.4]
laravel: [11.*]
stability: [prefer-stable]
include:
- laravel: 11.*
testbench: 9.*
exclude:
- laravel: 11.*
php: 8.1

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

Expand Down
26 changes: 14 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
}
],
"require": {
"php": "^8.2",
"php": "^8.3",
"justbetter/laravel-magento-async": "^1.0",
"justbetter/laravel-magento-client": "^2.6.1",
"justbetter/laravel-magento-products": "^1.4",
"laravel/framework": "11.*",
"laravel/framework": "^11.0|^12.0",
"spatie/laravel-activitylog": "^4.7"
},
"require-dev": {
"orchestra/testbench": "9.*",
"doctrine/dbal": "^3.4",
"larastan/larastan": "^2.9",
"laravel/pint": "^1.6",
"phpstan/phpstan-mockery": "^1.1",
"phpunit/phpunit": "^10.0",
"pestphp/pest": "^2.0"
"larastan/larastan": "^3.0",
"laravel/pint": "^1.20",
"orchestra/testbench": "^9.0",
"pestphp/pest": "^3.7",
"phpstan/phpstan-mockery": "^2.0",
"phpunit/phpunit": "^11.5"
},
"autoload": {
"psr-4": {
Expand All @@ -39,14 +39,16 @@
},
"scripts": {
"test": "phpunit",
"analyse": "phpstan",
"analyse": "phpstan --memory-limit=256M",
"style": "pint --test",
"quality": [
"@test",
"@style",
"@analyse",
"@style"
"@test",
"@coverage"
],
"fix-style": "pint"
"fix-style": "pint",
"coverage": "XDEBUG_MODE=coverage php vendor/bin/pest --coverage --min=100"
},
"config": {
"sort-packages": true,
Expand Down
2 changes: 1 addition & 1 deletion src/Listeners/BulkOperationStatusListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function execute(BulkOperation $operation): void
activity()
->useLog('error')
->withProperties([
'status' => $operation->status?->name ?? 'unknown',
'status' => $operation->status->name ?? 'unknown',
'response' => $operation->response,
])
->log('Failed to update Magento stock for SKU: '.$stock->sku);
Expand Down