Skip to content

Feat: Laravel-friendly model lookup #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Feat: Laravel-friendly model lookup #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
14b2959
feat: try app/models first
macaws Oct 31, 2025
1042699
fix: remove editor junk
macaws Oct 31, 2025
ea6af4f
fix: remove more editor junk
macaws Oct 31, 2025
6a40cde
chore: style fixes
macaws Oct 31, 2025
3f2fef2
fix: add explicit Error text to exceptions
macaws Oct 31, 2025
47cedd7
fix: update test to except new exception
macaws Oct 31, 2025
63e9873
chore: more style fixes
macaws Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Console/FlushCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Laravel\Scout\Console;

use Illuminate\Console\Command;
use Laravel\Scout\Exceptions\ScoutException;
use Symfony\Component\Console\Attribute\AsCommand;

#[AsCommand(name: 'scout:flush')]
Expand All @@ -26,10 +27,14 @@ class FlushCommand extends Command
* Execute the console command.
*
* @return void
*
* @throws ScoutException
*/
public function handle()
{
$class = $this->argument('model');
class_exists($class) || class_exists($class = app()->getNamespace()."Models\\{$class}")
|| throw new ScoutException("Error: Model [{$class}] not found.");

$model = new $class;

Expand Down
5 changes: 5 additions & 0 deletions src/Console/ImportCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Illuminate\Console\Command;
use Illuminate\Contracts\Events\Dispatcher;
use Laravel\Scout\Events\ModelsImported;
use Laravel\Scout\Exceptions\ScoutException;
use Symfony\Component\Console\Attribute\AsCommand;

#[AsCommand(name: 'scout:import')]
Expand Down Expand Up @@ -32,10 +33,14 @@ class ImportCommand extends Command
*
* @param \Illuminate\Contracts\Events\Dispatcher $events
* @return void
*
* @throws ScoutException
*/
public function handle(Dispatcher $events)
{
$class = $this->argument('model');
class_exists($class) || class_exists($class = app()->getNamespace()."Models\\{$class}")
|| throw new ScoutException("Error: Model [{$class}] not found.");

$model = new $class;

Expand Down
5 changes: 5 additions & 0 deletions src/Console/QueueImportCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Laravel\Scout\Console;

use Illuminate\Console\Command;
use Laravel\Scout\Exceptions\ScoutException;
use Laravel\Scout\Jobs\MakeRangeSearchable;
use Symfony\Component\Console\Attribute\AsCommand;

Expand Down Expand Up @@ -32,10 +33,14 @@ class QueueImportCommand extends Command
* Execute the console command.
*
* @return void
*
* @throws ScoutException
*/
public function handle()
{
$class = $this->argument('model');
class_exists($class) || class_exists($class = app()->getNamespace()."Models\\{$class}")
|| throw new ScoutException("Error: Model [{$class}] not found.");

$model = new $class;

Expand Down
4 changes: 2 additions & 2 deletions tests/Feature/Commands/QueueImportCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Laravel\Scout\Tests\Feature\Commands;

use Error;
use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
use Illuminate\Support\Facades\Queue;
use Laravel\Scout\Exceptions\ScoutException;
use Laravel\Scout\Jobs\MakeRangeSearchable;
use Orchestra\Testbench\Attributes\WithConfig;
use Orchestra\Testbench\Attributes\WithMigration;
Expand Down Expand Up @@ -254,7 +254,7 @@ public function test_it_dispatches_jobs_with_correct_parameters()

public function test_it_handles_invalid_model_class()
{
$this->expectException(Error::class);
$this->expectException(ScoutException::class);

$this->artisan('scout:queue-import', ['model' => 'NonExistentModel']);
}
Expand Down