Skip to content

Commit de44aba

Browse files
committed
Rename the ScoutServiceProvider
1 parent c75317a commit de44aba

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"providers": [
7373
"MongoDB\\Laravel\\MongoDBServiceProvider",
7474
"MongoDB\\Laravel\\MongoDBBusServiceProvider",
75-
"MongoDB\\Laravel\\Scout\\ScoutServiceProvider"
75+
"MongoDB\\Laravel\\Scout\\MongoDBScoutServiceProvider"
7676
]
7777
}
7878
},

src/Scout/ScoutServiceProvider.php renamed to src/Scout/MongoDBScoutServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use function assert;
1212
use function sprintf;
1313

14-
class ScoutServiceProvider extends ServiceProvider
14+
class MongoDBScoutServiceProvider extends ServiceProvider
1515
{
1616
public function register(): void
1717
{

tests/TestCase.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@
44

55
namespace MongoDB\Laravel\Tests;
66

7+
use Illuminate\Database\Eloquent\Model;
78
use Illuminate\Foundation\Application;
9+
use Laravel\Scout\ScoutServiceProvider;
810
use MongoDB\Laravel\MongoDBServiceProvider;
9-
use MongoDB\Laravel\Scout\ScoutServiceProvider;
11+
use MongoDB\Laravel\Scout\MongoDBScoutServiceProvider;
1012
use MongoDB\Laravel\Tests\Models\User;
1113
use MongoDB\Laravel\Validation\ValidationServiceProvider;
1214
use Orchestra\Testbench\TestCase as OrchestraTestCase;
1315

1416
class TestCase extends OrchestraTestCase
1517
{
16-
/** @var class-string */
17-
protected static string $userModel = User::class;
18-
1918
/**
2019
* Get package providers.
2120
*
@@ -26,8 +25,8 @@ protected function getPackageProviders($app): array
2625
return [
2726
MongoDBServiceProvider::class,
2827
ValidationServiceProvider::class,
29-
\Laravel\Scout\ScoutServiceProvider::class,
3028
ScoutServiceProvider::class,
29+
MongoDBScoutServiceProvider::class,
3130
];
3231
}
3332

@@ -51,7 +50,7 @@ protected function getEnvironmentSetUp($app): void
5150
$app['config']->set('database.connections.mongodb2', $config['connections']['mongodb']);
5251

5352
$app['config']->set('auth.model', User::class);
54-
$app['config']->set('auth.providers.users.model', self::$userModel);
53+
$app['config']->set('auth.providers.users.model', static::getUserModel());
5554
$app['config']->set('cache.driver', 'array');
5655

5756
$app['config']->set('cache.stores.mongodb', [
@@ -73,4 +72,10 @@ protected function getEnvironmentSetUp($app): void
7372
$app['config']->set('scout.driver', 'mongodb');
7473
$app['config']->set('scout.prefix', 'scout_');
7574
}
75+
76+
/** @return class-string<Model> */
77+
protected static function getUserModel(): string
78+
{
79+
return User::class;
80+
}
7681
}

0 commit comments

Comments
 (0)