Merge pull request #4792 from RoboJackets/renovate/laravel-scout-10.x

Update dependency laravel/scout to v10.11.2

app/Nova/Resource.php

@@ -30,7 +30,7 @@ abstract class Resource extends NovaResource
      *
      * @param  \Laravel\Scout\Builder  $query
      *
-     * @phan-suppress PhanUndeclaredConstantOfClass
+     * @phan-suppress PhanTypeExpectedObjectOrClassName
      */
     public static function scoutQuery(NovaRequest $request, $query): Builder
     {

app/Nova/User.php

@@ -849,7 +849,8 @@ private static function adminCanRun(NovaRequest $request): bool
     /**
      * Build a Scout search query for the given resource.
      *
-     * @param  \Laravel\Scout\Builder  $query
+     * @param  \Laravel\Scout\Builder<\App\Models\User>  $query
+     * @return \Laravel\Scout\Builder<\App\Models\User>
      */
     public static function scoutQuery(NovaRequest $request, $query): \Laravel\Scout\Builder
     {

composer.json

@@ -44,7 +44,7 @@
         "laravel/horizon": "5.27.1",
         "laravel/nova": "4.35.1",
         "laravel/passport": "12.3.0",
-        "laravel/scout": "10.11.1",
+        "laravel/scout": "10.11.2",
         "laravel/slack-notification-channel": "3.3.1",
         "laravel/socialite": "5.15.1",
         "laravel/tinker": "2.9.0",

phpstan.neon

@@ -104,6 +104,8 @@ parameters:
     - '#Method App\\Nova\\Filters\\[a-zA-Z]+::apply\(\) return type with generic class Illuminate\\Database\\Eloquent\\Builder does not specify its types: TModelClass#'
     - '#Method App\\Nova\\Filters\\[a-zA-Z]+::options\(\) should return array<string, string> but returns array\.#'
     - '#Method App\\Nova\\Metrics\\TotalCollections::query\(\) return type with generic class Illuminate\\Database\\Eloquent\\Builder does not specify its types: TModelClass#'
+    - '#Method App\\Nova\\Resource::scoutQuery\(\) has parameter \$query with generic class Laravel\\Scout\\Builder but does not specify its types: TModel#'
+    - '#Method App\\Nova\\Resource::scoutQuery\(\) return type with generic class Laravel\\Scout\\Builder does not specify its types: TModel#'
     - '#Method App\\Nova\\Travel::showFieldOnForms\(\) has parameter \$formData with generic class Laravel\\Nova\\Fields\\FormData but does not specify its types: TKey, TValue#'
     - '#Method App\\Util\\DocuSign::getAccessToken\(\) should return string but returns mixed\.#'
     - '#Method App\\Util\\Matrix::[a-zA-Z]+\(\) has parameter \$decoded_itinerary with no value type specified in iterable type array\.#'
@@ -240,6 +242,7 @@ parameters:
     - '#Parameter \#2 \$query \(Illuminate\\Database\\Eloquent\\Builder<App\\Models\\[a-zA-Z]+>\) of method App\\Nova\\Filters\\[a-zA-Z]+::apply\(\) should be contravariant with parameter \$query \(Illuminate\\Database\\Eloquent\\Builder\) of method Laravel\\Nova\\Contracts\\Filter::apply\(\)#'
     - '#Parameter \#2 \$query \(Illuminate\\Database\\Eloquent\\Builder<App\\Models\\[a-zA-Z]+>\) of method App\\Nova\\Filters\\[a-zA-Z]+::apply\(\) should be contravariant with parameter \$query \(Illuminate\\Database\\Eloquent\\Builder\) of method Laravel\\Nova\\Filters\\Filter::apply\(\)#'
     - '#Parameter \#2 \$query \(Illuminate\\Database\\Eloquent\\Builder<App\\Models\\Attendance>\) of method App\\Nova\\Lenses\\RecentInactiveUsers::query\(\) should be contravariant with parameter \$query \(Illuminate\\Database\\Eloquent\\Builder\) of method Laravel\\Nova\\Lenses\\Lens::query\(\)#'
+    - '#Parameter \#2 \$query \(Laravel\\Scout\\Builder<App\\Models\\User>\) of method App\\Nova\\User::scoutQuery\(\) should be contravariant with parameter \$query \(Laravel\\Scout\\Builder\) of method App\\Nova\\Resource<App\\Models\\User>::scoutQuery\(\)#'
     - '#Parameter \#2 \$requestedRelationships of static method App\\Util\\AuthorizeInclude::authorize\(\) expects string\|null, mixed given\.#'
     - '#Parameter \#2 \$signatureHeader of static method Square\\Utils\\WebhooksHelper::isValidWebhookEventSignature\(\) expects string, string\|null given\.#'
     - '#Parameter \#2 \$string of function explode expects string, mixed given\.#'

psalm.xml

@@ -314,6 +314,7 @@
                 <file name="app/Nova/TravelAssignment.php"/>
                 <file name="app/Util/DocuSign.php"/>
                 <referencedFunction name="App\Nova\Metrics\TotalAttendance::count"/>
+                <referencedFunction name="App\Nova\Resource::scoutQuery"/>
                 <referencedFunction name="Illuminate\Support\Facades\Route::get"/>
                 <referencedFunction name="Illuminate\Support\Facades\Route::post"/>
                 <referencedFunction name="Laravel\Nova\Actions\ActionEvent::prune"/>