5.2.5

laravelwebdev · laravelwebdev · commit 05fd86e2ee64 · 2025-02-22T07:28:47.000+08:00
diff --git a/composer.json b/composer.json
@@ -16,10 +16,10 @@
     "php": "^8.1",
     "ext-json": "*",
     "brick/money": "^0.8|^0.9|^0.10",
-    "illuminate/filesystem": "^10.48.23|^11.35",
-    "illuminate/support": "^10.48.23|^11.35",
+    "illuminate/filesystem": "^10.48.23|^11.35|^12.0",
+    "illuminate/support": "^10.48.23|^11.35|^12.0",
     "inertiajs/inertia-laravel": "^1.3.2|^2.0",
-    "laravel/fortify": "^1.25.3",
+    "laravel/fortify": "^1.25.4",
     "nesbot/carbon": "^2.62.1|^3.4",
     "rap2hpoutre/fast-excel": "^5.4",
     "spatie/once": "^3.0",
@@ -33,16 +33,16 @@
   },
   "require-dev": {
     "doctrine/dbal": "^3.5.1|^4.0",
-    "larastan/larastan": "^2.9.14",
+    "larastan/larastan": "^2.9.14|^3.1",
     "laravel/pint": "^1.20",
-    "laravel/scout": "^10.11",
-    "orchestra/testbench-core": "^8.30|^9.7",
-    "orchestra/testbench-dusk": "^8.32|^9.10",
-    "orchestra/workbench": "^8.13|^9.9",
-    "phpstan/phpstan": "^1.12.17",
+    "laravel/scout": "^10.12.2",
+    "orchestra/testbench-core": "^8.30|^9.7|^10.0",
+    "orchestra/testbench-dusk": "^8.32|^9.10|^10.0",
+    "orchestra/workbench": "^8.13|^9.9|^10.0",
+    "phpstan/phpstan": "^1.12.17|^2.1",
     "phpunit/phpunit": "^10.5.35|^11.3.5",
     "predis/predis": "^2.3",
-    "spatie/laravel-ray": "^1.39"
+    "spatie/laravel-ray": "^1.39.1"
   },
   "autoload": {
     "psr-4": {
@@ -162,5 +162,5 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.2.4"
+  "version": "5.2.5"
 }
diff --git a/src/Actions/DispatchAction.php b/src/Actions/DispatchAction.php
@@ -88,8 +88,6 @@ public function dispatch(): Response
      * Dispatch the given action.
      *
      * @return $this
-     *
-     * @throws \Throwable
      */
     public function handleStandalone(string $method)
     {
@@ -112,8 +110,6 @@ public function handleStandalone(string $method)
      * Dispatch the given action.
      *
      * @return $this
-     *
-     * @throws \Throwable
      */
     public function handleRequest(ActionRequest $request, string $method, int $chunkCount)
     {
diff --git a/src/AuthorizedToSee.php b/src/AuthorizedToSee.php
@@ -10,7 +10,7 @@ trait AuthorizedToSee
     /**
      * The callback used to authorize viewing the filter or action.
      *
-     * @var (\Closure(\Illuminate\Http\Request):(bool))|null
+     * @var (\Closure(\Laravel\Nova\Http\Requests\NovaRequest|\Illuminate\Http\Request):(bool))|null
      */
     public $seeCallback = null;
 
@@ -21,13 +21,15 @@ trait AuthorizedToSee
      */
     public function authorizedToSee(Request $request)
     {
-        return is_callable($this->seeCallback) ? call_user_func($this->seeCallback, $request) : true;
+        return is_callable($this->seeCallback)
+            ? call_user_func($this->seeCallback, $request) // @phpstan-ignore argument.type
+            : true;
     }
 
     /**
      * Set the callback to be run to authorize viewing the filter or action.
      *
-     * @param  \Closure(\Illuminate\Http\Request):bool  $callback
+     * @param  \Closure(\Laravel\Nova\Http\Requests\NovaRequest|\Illuminate\Http\Request):bool  $callback
      * @return $this
      */
     public function canSee(Closure $callback)
diff --git a/src/Concerns/InteractsWithActionEvent.php b/src/Concerns/InteractsWithActionEvent.php
@@ -34,7 +34,7 @@ public static function actionEvent(): Model|ActionEvent
     public static function usingActionEvent(callable $callback): mixed
     {
         if (! is_null(config('nova.actions.resource'))) {
-            return call_user_func($callback, static::actionEvent());
+            return call_user_func($callback, static::actionEvent()); // @phpstan-ignore argument.type
         }
 
         return null;
diff --git a/src/Console/ResourceCommand.php b/src/Console/ResourceCommand.php
@@ -71,7 +71,7 @@ public function handle()
             'name' => 'Resource',
         ]);
 
-        parent::handle();
+        return parent::handle();
     }
 
     /**
diff --git a/src/Fields/Attachments/DetachAnyAttachment.php b/src/Fields/Attachments/DetachAnyAttachment.php
@@ -2,14 +2,14 @@
 
 namespace Laravel\Nova\Fields\Attachments;
 
-use Illuminate\Http\Request;
+use Laravel\Nova\Http\Requests\NovaRequest;
 
 class DetachAnyAttachment
 {
     /**
      * Delete any attachments from the field.
      */
-    public function __invoke(Request $request): void
+    public function __invoke(NovaRequest $request): void
     {
         call_user_func(new DetachAttachment, $request);
         call_user_func(new DetachPendingAttachment, $request);
diff --git a/src/Fields/Badge.php b/src/Fields/Badge.php
@@ -209,13 +209,13 @@ public function resolveLabel(): Stringable|string
     /**
      * Resolve the display label for the Badge.
      */
-    protected function resolveLabelFor(string|int $value): Stringable|string
+    protected function resolveLabelFor(string|int|null $value): Stringable|string
     {
         if (isset($this->labelCallback)) {
             return call_user_func($this->labelCallback, $value);
         }
 
-        return $this->labels[$value] ?? $value;
+        return $this->labels[$value] ?? $value ?? '';
     }
 
     /**
diff --git a/src/Fields/BelongsTo.php b/src/Fields/BelongsTo.php
@@ -216,10 +216,10 @@ public function getRules(NovaRequest $request): array
         )->toBase();
 
         return array_merge_recursive(parent::getRules($request), [
-            $this->attribute => array_filter([
+            $this->attribute => [
                 $this->nullable ? 'nullable' : 'required',
                 new Relatable($request, $query, $this),
-            ]),
+            ],
         ]);
     }
 
diff --git a/src/Fields/FieldCollection.php b/src/Fields/FieldCollection.php
@@ -292,7 +292,11 @@ public function withOnlyFilterableFields()
         return $this->whereInstanceOf(Field::class)
             ->whereInstanceOf(FilterableField::class)
             ->reject(static function ($field) {
-                /** @var \Laravel\Nova\Fields\Field&\Laravel\Nova\Contracts\FilterableField $field */
+                /**
+                 * @var \Laravel\Nova\Fields\Field&\Laravel\Nova\Contracts\FilterableField $field
+                 *
+                 * @phpstan-ignore varTag.nativeType
+                 */
                 return $field->isComputed() || is_null($field->filterableCallback);
             });
     }
diff --git a/src/Fields/FieldElement.php b/src/Fields/FieldElement.php
@@ -6,6 +6,9 @@
 use Laravel\Nova\Http\Requests\NovaRequest;
 use Laravel\Nova\Panel;
 
+/**
+ * @phpstan-type TMixedResource \Illuminate\Database\Eloquent\Model|\Laravel\Nova\Support\Fluent|object|array
+ */
 abstract class FieldElement extends Element
 {
     /**
@@ -18,14 +21,18 @@ abstract class FieldElement extends Element
     /**
      * Indicates if the element should be shown on the index view.
      *
-     * @var (callable():(bool))|bool
+     * @var (callable(\Laravel\Nova\Http\Requests\NovaRequest, mixed):(bool))|bool
+     *
+     * @phpstan-var (callable(\Laravel\Nova\Http\Requests\NovaRequest, TMixedResource):(bool))|bool
      */
     public $showOnIndex = true;
 
     /**
      * Indicates if the element should be shown on the detail view.
      *
-     * @var (callable():(bool))|bool
+     * @var (callable(\Laravel\Nova\Http\Requests\NovaRequest, mixed):(bool))|bool
+     *
+     * @phpstan-var (callable(\Laravel\Nova\Http\Requests\NovaRequest, TMixedResource):(bool))|bool
      */
     public $showOnDetail = true;
 
@@ -110,8 +117,10 @@ public function hideWhenUpdating(callable|bool $callback = true)
     /**
      * Specify that the element should be visible on the index view.
      *
-     * @param  (callable():(bool))|bool  $callback
+     * @param  (callable(\Laravel\Nova\Http\Requests\NovaRequest, mixed):(bool))|bool  $callback
      * @return $this
+     *
+     * @phpstan-param (callable(\Laravel\Nova\Http\Requests\NovaRequest, TMixedResource):(bool))|bool  $callback
      */
     public function showOnIndex(callable|bool $callback = true)
     {
@@ -125,6 +134,8 @@ public function showOnIndex(callable|bool $callback = true)
      *
      * @param  (callable(\Laravel\Nova\Http\Requests\NovaRequest, mixed):(bool))|bool  $callback
      * @return $this
+     *
+     * @phpstan-param (callable(\Laravel\Nova\Http\Requests\NovaRequest, TMixedResource):(bool))|bool  $callback
      */
     public function showOnDetail(callable|bool $callback = true)
     {
diff --git a/src/Fields/HasAttachments.php b/src/Fields/HasAttachments.php
@@ -25,28 +25,28 @@ trait HasAttachments
     /**
      * The callback that should be executed to store file attachments.
      *
-     * @var callable(\Illuminate\Http\Request):array{path: string, url: string}
+     * @var callable(\Laravel\Nova\Http\Requests\NovaRequest):array{path: string, url: string}
      */
     public $attachCallback;
 
     /**
      * The callback that should be executed to delete persisted file attachments.
      *
-     * @var callable(\Illuminate\Http\Request):void
+     * @var (callable(\Laravel\Nova\Http\Requests\NovaRequest):void)|\Laravel\Nova\Fields\Attachments\DetachAnyAttachment
      */
     public $detachCallback;
 
     /**
      * The callback that should be executed to discard file attachments.
      *
-     * @var callable(\Illuminate\Http\Request):void
+     * @var callable(\Laravel\Nova\Http\Requests\NovaRequest):void
      */
     public $discardCallback;
 
     /**
      * Specify the callback that should be used to store file attachments.
      *
-     * @param  callable(\Illuminate\Http\Request):array{path: string, url: string}  $callback
+     * @param  callable(\Laravel\Nova\Http\Requests\NovaRequest):array{path: string, url: string}  $callback
      * @return $this
      */
     public function attach(callable $callback)
@@ -61,7 +61,7 @@ public function attach(callable $callback)
     /**
      * Specify the callback that should be used to delete a single, persisted file attachment.
      *
-     * @param  callable(\Illuminate\Http\Request):void  $callback
+     * @param  callable(\Laravel\Nova\Http\Requests\NovaRequest):void  $callback
      * @return $this
      */
     public function detach(callable $callback)
diff --git a/src/Fields/MorphTo.php b/src/Fields/MorphTo.php
@@ -393,12 +393,13 @@ protected function formatDisplayValue(Resource $resource, string $relatedResourc
      */
     public function types(array $types)
     {
-        $this->morphToTypes = collect($types)->map(static fn ($display, $key) => [
-            'type' => is_numeric($key) ? $display : $key,
-            'singularLabel' => is_numeric($key) ? $display::singularLabel() : $key::singularLabel(),
-            'display' => (is_string($display) && is_numeric($key)) ? $display::singularLabel() : $display,
-            'value' => is_numeric($key) ? $display::uriKey() : $key::uriKey(),
-        ])->values()->all();
+        $this->morphToTypes = collect($types)
+            ->map(static fn ($display, $key) => [ // @phpstan-ignore argument.unresolvableType
+                'type' => is_numeric($key) ? $display : $key,
+                'singularLabel' => is_numeric($key) ? $display::singularLabel() : $key::singularLabel(),
+                'display' => (is_string($display) && is_numeric($key)) ? $display::singularLabel() : $display,
+                'value' => is_numeric($key) ? $display::uriKey() : $key::uriKey(),
+            ])->values()->all();
 
         return $this;
     }
diff --git a/src/Fields/MorphToMany.php b/src/Fields/MorphToMany.php
@@ -155,9 +155,10 @@ public function getRules(NovaRequest $request): array
         $withTrashed = $request->{$this->attribute.'_trashed'} === 'true';
 
         return array_merge_recursive(parent::getRules($request), [
-            $this->attribute => array_filter([
-                'required', new RelatableAttachment($request, $this->buildAttachableQuery($request, $withTrashed)->toBase(), $this),
-            ]),
+            $this->attribute => [
+                'required',
+                new RelatableAttachment($request, $this->buildAttachableQuery($request, $withTrashed)->toBase(), $this),
+            ],
         ]);
     }
 
diff --git a/src/Fields/PreviewableFields.php b/src/Fields/PreviewableFields.php
@@ -9,14 +9,14 @@ trait PreviewableFields
     /**
      * Indicates whether to show the field in the modal preview.
      *
-     * @var (callable(\Laravel\Nova\Http\Requests\NovaRequest):(bool))|bool
+     * @var (callable(\Laravel\Nova\Http\Requests\NovaRequest, \Illuminate\Database\Eloquent\Model|\Laravel\Nova\Support\Fluent|object|array):(bool))|bool
      */
     public $showOnPreview = false;
 
     /**
      * Show the field in the modal preview.
      *
-     * @param  (callable(\Laravel\Nova\Http\Requests\NovaRequest):(bool))|bool  $callback
+     * @param  (callable(\Laravel\Nova\Http\Requests\NovaRequest, \Illuminate\Database\Eloquent\Model|\Laravel\Nova\Support\Fluent|object|array):(bool))|bool  $callback
      * @return $this
      */
     public function showOnPreview(callable|bool $callback = true)
diff --git a/src/Fields/Textarea.php b/src/Fields/Textarea.php
@@ -76,7 +76,7 @@ protected function makeFilter(NovaRequest $request)
      * @param  (callable():(bool))|bool  $callback
      * @return never
      *
-     * @throws \Laravel\Nova\Exceptions\NovaException
+     * @throws \Laravel\Nova\Exceptions\HelperNotSupported
      */
     public function showOnIndex($callback = true)
     {
diff --git a/src/Metrics/Metric.php b/src/Metrics/Metric.php
@@ -110,7 +110,7 @@ public function name()
      */
     public function cacheFor()
     {
-        //
+        return null;
     }
 
     /**
diff --git a/src/Resource.php b/src/Resource.php
@@ -389,7 +389,7 @@ public function title()
      */
     public function subtitle()
     {
-        //
+        return null;
     }
 
     /**
diff --git a/src/Tabs/Tab.php b/src/Tabs/Tab.php
@@ -66,7 +66,6 @@ public static function group($name = null, callable|iterable $fields = [], ?stri
     public static function mutate(self $tab, iterable $fields)
     {
         return tap(new static($tab->name, $fields), static function ($newTab) use ($tab) {
-            /** @var \Laravel\Nova\Tabs\Tab $newTab */
             $newTab->withAttribute($tab->attribute);
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,6 @@ public function dispatch(): Response`
`88`	`88`	`* Dispatch the given action.`
`89`	`89`	`*`
`90`	`90`	`* @return $this`
`91`		`- *`
`92`		`- * @throws \Throwable`
`93`	`91`	`*/`
`94`	`92`	`public function handleStandalone(string $method)`
`95`	`93`	`{`
`@@ -112,8 +110,6 @@ public function handleStandalone(string $method)`
`112`	`110`	`* Dispatch the given action.`
`113`	`111`	`*`
`114`	`112`	`* @return $this`
`115`		`- *`
`116`		`- * @throws \Throwable`
`117`	`113`	`*/`
`118`	`114`	`public function handleRequest(ActionRequest $request, string $method, int $chunkCount)`
`119`	`115`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ trait AuthorizedToSee`
`10`	`10`	`/**`
`11`	`11`	`* The callback used to authorize viewing the filter or action.`
`12`	`12`	`*`
`13`		`- * @var (\Closure(\Illuminate\Http\Request):(bool))\|null`
	`13`	`+ * @var (\Closure(\Laravel\Nova\Http\Requests\NovaRequest\|\Illuminate\Http\Request):(bool))\|null`
`14`	`14`	`*/`
`15`	`15`	`public $seeCallback = null;`
`16`	`16`
`@@ -21,13 +21,15 @@ trait AuthorizedToSee`
`21`	`21`	`*/`
`22`	`22`	`public function authorizedToSee(Request $request)`
`23`	`23`	`{`
`24`		`- return is_callable($this->seeCallback) ? call_user_func($this->seeCallback, $request) : true;`
	`24`	`+ return is_callable($this->seeCallback)`
	`25`	`+ ? call_user_func($this->seeCallback, $request) // @phpstan-ignore argument.type`
	`26`	`+ : true;`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`/**`
`28`	`30`	`* Set the callback to be run to authorize viewing the filter or action.`
`29`	`31`	`*`
`30`		`- * @param \Closure(\Illuminate\Http\Request):bool $callback`
	`32`	`+ * @param \Closure(\Laravel\Nova\Http\Requests\NovaRequest\|\Illuminate\Http\Request):bool $callback`
`31`	`33`	`* @return $this`
`32`	`34`	`*/`
`33`	`35`	`public function canSee(Closure $callback)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public static function actionEvent(): Model\|ActionEvent`
`34`	`34`	`public static function usingActionEvent(callable $callback): mixed`
`35`	`35`	`{`
`36`	`36`	`if (! is_null(config('nova.actions.resource'))) {`
`37`		`- return call_user_func($callback, static::actionEvent());`
	`37`	`+ return call_user_func($callback, static::actionEvent()); // @phpstan-ignore argument.type`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function handle()`
`71`	`71`	`'name' => 'Resource',`
`72`	`72`	`]);`
`73`	`73`
`74`		`- parent::handle();`
	`74`	`+ return parent::handle();`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@`
`2`	`2`
`3`	`3`	`namespace Laravel\Nova\Fields\Attachments;`
`4`	`4`
`5`		`-use Illuminate\Http\Request;`
	`5`	`+use Laravel\Nova\Http\Requests\NovaRequest;`
`6`	`6`
`7`	`7`	`class DetachAnyAttachment`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Delete any attachments from the field.`
`11`	`11`	`*/`
`12`		`- public function __invoke(Request $request): void`
	`12`	`+ public function __invoke(NovaRequest $request): void`
`13`	`13`	`{`
`14`	`14`	`call_user_func(new DetachAttachment, $request);`
`15`	`15`	`call_user_func(new DetachPendingAttachment, $request);`
Original file line number	Diff line number	Diff line change
`@@ -209,13 +209,13 @@ public function resolveLabel(): Stringable\|string`
`209`	`209`	`/**`
`210`	`210`	`* Resolve the display label for the Badge.`
`211`	`211`	`*/`
`212`		`- protected function resolveLabelFor(string\|int $value): Stringable\|string`
	`212`	`+ protected function resolveLabelFor(string\|int\|null $value): Stringable\|string`
`213`	`213`	`{`
`214`	`214`	`if (isset($this->labelCallback)) {`
`215`	`215`	`return call_user_func($this->labelCallback, $value);`
`216`	`216`	`}`
`217`	`217`
`218`		`- return $this->labels[$value] ?? $value;`
	`218`	`+ return $this->labels[$value] ?? $value ?? '';`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`/**`