diff --git a/packages/panels/src/Commands/FileGenerators/Resources/ResourceClassGenerator.php b/packages/panels/src/Commands/FileGenerators/Resources/ResourceClassGenerator.php index 8a605575b7..d6a22258c1 100644 --- a/packages/panels/src/Commands/FileGenerators/Resources/ResourceClassGenerator.php +++ b/packages/panels/src/Commands/FileGenerators/Resources/ResourceClassGenerator.php @@ -114,7 +114,7 @@ class ResourceClassGenerator extends ClassGenerator $this->addTableMethodToClass($class); $this->addGetRelationsMethodToClass($class); $this->addGetPagesMethodToClass($class); - $this->addGetEloquentQueryMethodToClass($class); + $this->addGetRecordRouteBindingEloquentQueryMethodToClass($class); } protected function addModelPropertyToClass(ClassType $class): void @@ -328,28 +328,28 @@ class ResourceClassGenerator extends ClassGenerator protected function configureGetPagesMethod(Method $method): void {} - protected function addGetEloquentQueryMethodToClass(ClassType $class): void + protected function addGetRecordRouteBindingEloquentQueryMethodToClass(ClassType $class): void { if (! $this->isSoftDeletable()) { return; } - $method = $class->addMethod('getEloquentQuery') + $method = $class->addMethod('getRecordRouteBindingEloquentQuery') ->setPublic() ->setStatic() ->setReturnType(Builder::class) ->setBody( <<withoutGlobalScopes([ {$this->simplifyFqn(SoftDeletingScope::class)}::class, ]); PHP ); - $this->configureGetEloquentQueryMethod($method); + $this->configureGetRecordRouteBindingEloquentQueryMethod($method); } - protected function configureGetEloquentQueryMethod(Method $method): void {} + protected function configureGetRecordRouteBindingEloquentQueryMethod(Method $method): void {} public function getFqn(): string { diff --git a/packages/panels/src/Resources/Resource/Concerns/HasRoutes.php b/packages/panels/src/Resources/Resource/Concerns/HasRoutes.php index 9bdd8c3bd1..64dcbe2887 100644 --- a/packages/panels/src/Resources/Resource/Concerns/HasRoutes.php +++ b/packages/panels/src/Resources/Resource/Concerns/HasRoutes.php @@ -5,6 +5,7 @@ namespace Filament\Resources\Resource\Concerns; use Closure; use Filament\Facades\Filament; use Filament\Panel; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Route; use Illuminate\Support\Stringable; @@ -25,9 +26,14 @@ trait HasRoutes */ protected static string | array $withoutRouteMiddleware = []; + public static function getRecordRouteBindingEloquentQuery(): Builder + { + return static::getEloquentQuery(); + } + public static function resolveRecordRouteBinding(int | string $key, ?Closure $modifyQuery = null): ?Model { - $query = static::getEloquentQuery(); + $query = static::getRecordRouteBindingEloquentQuery(); if ($modifyQuery) { $query = $modifyQuery($query) ?? $query; diff --git a/tests/.pest/snapshots/src/Panels/Commands/Legacy/LegacyMakeResourceCommandTest/it_can_generate_a_resource_class_with_soft_deletes.snap b/tests/.pest/snapshots/src/Panels/Commands/Legacy/LegacyMakeResourceCommandTest/it_can_generate_a_resource_class_with_soft_deletes.snap index afb2574860..c4046d14c8 100644 --- a/tests/.pest/snapshots/src/Panels/Commands/Legacy/LegacyMakeResourceCommandTest/it_can_generate_a_resource_class_with_soft_deletes.snap +++ b/tests/.pest/snapshots/src/Panels/Commands/Legacy/LegacyMakeResourceCommandTest/it_can_generate_a_resource_class_with_soft_deletes.snap @@ -66,9 +66,9 @@ class PostResource extends Resource ]; } - public static function getEloquentQuery(): Builder + public static function getRecordRouteBindingEloquentQuery(): Builder { - return parent::getEloquentQuery() + return parent::getRecordRouteBindingEloquentQuery() ->withoutGlobalScopes([ SoftDeletingScope::class, ]); diff --git a/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_a_resource_class_with_soft_deletes.snap b/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_a_resource_class_with_soft_deletes.snap index 51b98169b3..62af9c49bc 100644 --- a/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_a_resource_class_with_soft_deletes.snap +++ b/tests/.pest/snapshots/src/Panels/Commands/MakeResourceCommandTest/it_can_generate_a_resource_class_with_soft_deletes.snap @@ -48,9 +48,9 @@ class PostResource extends Resource ]; } - public static function getEloquentQuery(): Builder + public static function getRecordRouteBindingEloquentQuery(): Builder { - return parent::getEloquentQuery() + return parent::getRecordRouteBindingEloquentQuery() ->withoutGlobalScopes([ SoftDeletingScope::class, ]);