Merge pull request #5 from justbetter/feature/laravel12

Laravel 12 support

Author: VincentBean

.github/workflows/analyse.yml

@@ -9,7 +9,7 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                php: [8.3]
+                php: [8.3, 8.4]
                 laravel: [11.*]
                 stability: [prefer-stable]
                 include:

.github/workflows/coverage.yml

@@ -9,7 +9,7 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                php: [8.3]
+                php: [8.4]
                 laravel: [11.*]
                 stability: [prefer-stable]
                 include:
@@ -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

.github/workflows/style.yml

@@ -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
 

.github/workflows/tests.yml

@@ -9,7 +9,7 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                php: [8.2, 8.3]
+                php: [8.3, 8.4]
                 laravel: [11.*]
                 stability: [prefer-lowest, prefer-stable]
                 include:

composer.json

@@ -4,19 +4,19 @@
     "type": "package",
     "license": "MIT",
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "guzzlehttp/guzzle": "^7.5",
-        "laravel/framework": "^11.0",
         "justbetter/laravel-magento-client": "^2.4",
-        "justbetter/laravel-magento-webhooks": "^2.1"
+        "justbetter/laravel-magento-webhooks": "^2.1",
+        "laravel/framework": "^11.0|^12.0"
     },
     "require-dev": {
-        "larastan/larastan": "^2.5",
-        "laravel/pint": "^1.16",
+        "larastan/larastan": "^3.0",
+        "laravel/pint": "^1.20",
         "orchestra/testbench": "^9.0",
-        "pestphp/pest": "^2.0",
-        "phpstan/phpstan-mockery": "^1.1",
-        "phpunit/phpunit": "^10.0"
+        "pestphp/pest": "^3.7",
+        "phpstan/phpstan-mockery": "^2.0",
+        "phpunit/phpunit": "^11.5"
     },
     "authors": [
         {
@@ -42,14 +42,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,

src/Actions/RetryBulkRequest.php

@@ -52,9 +52,7 @@ public function retry(BulkRequest $bulkRequest, bool $onlyFailed): ?BulkRequest
             default => throw new InvalidMethodException('Unsupported method "'.$bulkRequest->method.'"'),
         };
 
-        if ($retry !== null) {
-            $bulkRequest->retries()->save($retry);
-        }
+        $bulkRequest->retries()->save($retry);
 
         return $retry;
     }

src/Concerns/HasOperations.php

@@ -10,6 +10,8 @@
  * @mixin Model
  *
  * @codeCoverageIgnore
+ *
+ * @phpstan-ignore-next-line
  */
 trait HasOperations
 {

src/Models/BulkOperation.php

@@ -14,7 +14,7 @@
  * @property ?string $subject_type
  * @property int $operation_id
  * @property ?OperationStatus $status
- * @property ?array $response
+ * @property ?array<array-key, mixed> $response
  * @property ?Carbon $created_at
  * @property ?Carbon $updated_at
  * @property ?Model $subject
@@ -31,13 +31,13 @@ class BulkOperation extends Model
         'response' => 'array',
     ];
 
-    /** @return MorphTo<Model, BulkOperation> */
+    /** @return MorphTo<Model, covariant BulkOperation> */
     public function subject(): MorphTo
     {
         return $this->morphTo();
     }
 
-    /** @return BelongsTo<BulkRequest, BulkOperation> */
+    /** @return BelongsTo<covariant BulkRequest, covariant BulkOperation> */
     public function request(): BelongsTo
     {
         return $this->belongsTo(BulkRequest::class, 'bulk_request_id');

src/Models/BulkRequest.php

@@ -16,8 +16,8 @@
  * @property string $method
  * @property string $path
  * @property string $bulk_uuid
- * @property array $request
- * @property array $response
+ * @property array<array-key, mixed> $request
+ * @property array<array-key, mixed> $response
  * @property ?Carbon $started_at
  * @property ?Carbon $created_at
  * @property ?Carbon $updated_at
@@ -37,19 +37,19 @@ class BulkRequest extends Model
         'started_at' => 'datetime',
     ];
 
-    /** @return HasMany<BulkOperation> */
+    /** @return HasMany<BulkOperation, $this> */
     public function operations(): HasMany
     {
         return $this->hasMany(BulkOperation::class);
     }
 
-    /** @return HasMany<BulkRequest> */
+    /** @return HasMany<BulkRequest, $this> */
     public function retries(): HasMany
     {
         return $this->hasMany(BulkRequest::class, 'retry_of', 'id');
     }
 
-    /** @return BelongsTo<BulkRequest, BulkRequest> */
+    /** @return BelongsTo<covariant BulkRequest, covariant BulkRequest> */
     public function retryOf(): BelongsTo
     {
         return $this->belongsTo(BulkRequest::class, 'retry_of', 'id');