Merge pull request #3 from justbetter/feature/laravel12

VincentBean · web-flow · commit 593646b754bf · 2025-02-17T11:11:57.000+01:00
Laravel 12 / Nova 5 support
diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml
@@ -0,0 +1,39 @@
+name: analyse
+
+on: ['push', 'pull_request']
+
+jobs:
+    test:
+        runs-on: ${{ matrix.os }}
+        strategy:
+            fail-fast: true
+            matrix:
+                os: [ubuntu-latest]
+                php: [8.3, 8.4]
+                laravel: [11.*]
+                stability: [prefer-stable]
+                include:
+                    - laravel: 11.*
+                      testbench: 9.*
+
+        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+                  coverage: none
+
+            - name: Install dependencies
+              env:
+                  COMPOSER_AUTH: '{"http-basic":{"nova.laravel.com":{"username":"${{secrets.NOVA_USERNAME}}","password":"${{secrets.NOVA_PASSWORD}}"}}}'
+              run: |
+                  composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+                  composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+            - name: Analyse
+              run: composer analyse
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -0,0 +1,34 @@
+name: style
+
+on:
+    push:
+        branches:
+            - main
+jobs:
+    style:
+        name: Style
+        runs-on: ubuntu-latest
+
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v4
+
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: 8.4
+                    extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+                    coverage: none
+
+            -   name: Install dependencies
+                env:
+                    COMPOSER_AUTH: '{"http-basic":{"nova.laravel.com":{"username":"${{secrets.NOVA_USERNAME}}","password":"${{secrets.NOVA_PASSWORD}}"}}}'
+                run: composer install
+
+            -   name: Style
+                run: composer fix-style
+
+            -   name: Commit Changes
+                uses: stefanzweifel/git-auto-commit-action@v4
+                with:
+                    commit_message: Fix styling changes
diff --git a/composer.json b/composer.json
@@ -16,30 +16,36 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
+        "bolechen/nova-activitylog": "^0.5.0",
         "justbetter/laravel-magento-customer-prices": "^3.0",
-        "laravel/nova": "^4.0",
-        "bolechen/nova-activitylog": "^0.4.0"
+        "laravel/framework": "^11.0|^12.0",
+        "laravel/nova": "^5.0"
     },
     "require-dev": {
-        "laravel/pint": "^1.16",
-        "orchestra/testbench": "^9.1",
-        "phpunit/phpunit": "^11.2",
-        "larastan/larastan": "^2.9",
-        "phpstan/phpstan-mockery": "^1.1"
+        "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": {
             "JustBetter\\MagentoCustomerPricesNova\\": "src"
         }
     },
     "scripts": {
-        "analyse": "phpstan",
+        "analyse": "phpstan --memory-limit=256M",
         "style": "pint --test",
         "quality": [
+            "@style",
             "@analyse",
-            "@style"
-        ]
+            "@test",
+            "@coverage"
+        ],
+        "test": "phpunit",
+        "coverage": "XDEBUG_MODE=coverage php vendor/bin/pest --coverage --min=0"
     },
     "extra": {
         "laravel": {
@@ -49,7 +55,10 @@
         }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "pestphp/pest-plugin": true
+        }
     },
     "minimum-stability": "stable",
     "prefer-stable": true,
diff --git a/src/Nova/Filters/Failed.php b/src/Nova/Filters/Failed.php
@@ -2,14 +2,15 @@
 
 namespace JustBetter\MagentoCustomerPricesNova\Nova\Filters;
 
+use Illuminate\Contracts\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Builder;
 use Laravel\Nova\Filters\Filter;
 use Laravel\Nova\Http\Requests\NovaRequest;
 
 class Failed extends Filter
 {
     /** @param  Builder  $query */
-    public function apply(NovaRequest $request, $query, $value): Builder
+    public function apply(NovaRequest $request, EloquentBuilder $query, mixed $value): Builder|EloquentBuilder
     {
         return match ($value) {
             'day' => $query->whereDate('last_failed', '>=', now()->startOfDay()),
diff --git a/src/Nova/Filters/Product.php b/src/Nova/Filters/Product.php
@@ -2,6 +2,7 @@
 
 namespace JustBetter\MagentoCustomerPricesNova\Nova\Filters;
 
+use Illuminate\Contracts\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Builder;
 use Laravel\Nova\Filters\Filter;
 use Laravel\Nova\Http\Requests\NovaRequest;
@@ -14,7 +15,7 @@ public function __construct()
     }
 
     /** @param Builder $query */
-    public function apply(NovaRequest $request, $query, $value): Builder
+    public function apply(NovaRequest $request, EloquentBuilder $query, mixed $value): Builder|EloquentBuilder
     {
         return $query->whereHas('product', function (Builder $query) use ($value): void {
             $query->where('exists_in_magento', '=', $value);
diff --git a/src/Nova/Filters/Status.php b/src/Nova/Filters/Status.php
@@ -2,14 +2,15 @@
 
 namespace JustBetter\MagentoCustomerPricesNova\Nova\Filters;
 
+use Illuminate\Contracts\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Builder;
 use Laravel\Nova\Filters\Filter;
 use Laravel\Nova\Http\Requests\NovaRequest;
 
 class Status extends Filter
 {
     /** @param Builder $query */
-    public function apply(NovaRequest $request, $query, $value): Builder
+    public function apply(NovaRequest $request, EloquentBuilder $query, mixed $value): Builder|EloquentBuilder
     {
         return $query->where($value, '=', true);
     }
diff --git a/src/Nova/Filters/Sync.php b/src/Nova/Filters/Sync.php
@@ -2,14 +2,15 @@
 
 namespace JustBetter\MagentoCustomerPricesNova\Nova\Filters;
 
+use Illuminate\Contracts\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Builder;
 use Laravel\Nova\Filters\Filter;
 use Laravel\Nova\Http\Requests\NovaRequest;
 
 class Sync extends Filter
 {
     /** @param Builder $query */
-    public function apply(NovaRequest $request, $query, $value): Builder
+    public function apply(NovaRequest $request, EloquentBuilder $query, mixed $value): Builder|EloquentBuilder
     {
         return $query->where('sync', '=', $value);
     }

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,15 @@`
`2`	`2`
`3`	`3`	`namespace JustBetter\MagentoCustomerPricesNova\Nova\Filters;`
`4`	`4`
	`5`	`+use Illuminate\Contracts\Database\Eloquent\Builder as EloquentBuilder;`
`5`	`6`	`use Illuminate\Database\Eloquent\Builder;`
`6`	`7`	`use Laravel\Nova\Filters\Filter;`
`7`	`8`	`use Laravel\Nova\Http\Requests\NovaRequest;`
`8`	`9`
`9`	`10`	`class Failed extends Filter`
`10`	`11`	`{`
`11`	`12`	`/** @param Builder $query */`
`12`		`- public function apply(NovaRequest $request, $query, $value): Builder`
	`13`	`+ public function apply(NovaRequest $request, EloquentBuilder $query, mixed $value): Builder\|EloquentBuilder`
`13`	`14`	`{`
`14`	`15`	`return match ($value) {`
`15`	`16`	`'day' => $query->whereDate('last_failed', '>=', now()->startOfDay()),`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace JustBetter\MagentoCustomerPricesNova\Nova\Filters;`
`4`	`4`
	`5`	`+use Illuminate\Contracts\Database\Eloquent\Builder as EloquentBuilder;`
`5`	`6`	`use Illuminate\Database\Eloquent\Builder;`
`6`	`7`	`use Laravel\Nova\Filters\Filter;`
`7`	`8`	`use Laravel\Nova\Http\Requests\NovaRequest;`
`@@ -14,7 +15,7 @@ public function __construct()`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`/** @param Builder $query */`
`17`		`- public function apply(NovaRequest $request, $query, $value): Builder`
	`18`	`+ public function apply(NovaRequest $request, EloquentBuilder $query, mixed $value): Builder\|EloquentBuilder`
`18`	`19`	`{`
`19`	`20`	`return $query->whereHas('product', function (Builder $query) use ($value): void {`
`20`	`21`	`$query->where('exists_in_magento', '=', $value);`