Move scout engine declaration to the main MongoDBServiceProvider

Author: GromNaN

composer.json

@@ -71,8 +71,7 @@
         "laravel": {
             "providers": [
                 "MongoDB\\Laravel\\MongoDBServiceProvider",
-                "MongoDB\\Laravel\\MongoDBBusServiceProvider",
-                "MongoDB\\Laravel\\Scout\\MongoDBScoutServiceProvider"
+                "MongoDB\\Laravel\\MongoDBBusServiceProvider"
             ]
         }
     },

src/MongoDBServiceProvider.php

@@ -7,19 +7,22 @@
 use Closure;
 use Illuminate\Cache\CacheManager;
 use Illuminate\Cache\Repository;
+use Illuminate\Container\Container;
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Foundation\Application;
 use Illuminate\Session\SessionManager;
 use Illuminate\Support\ServiceProvider;
 use InvalidArgumentException;
+use Laravel\Scout\EngineManager;
 use League\Flysystem\Filesystem;
 use League\Flysystem\GridFS\GridFSAdapter;
 use League\Flysystem\ReadOnly\ReadOnlyFilesystemAdapter;
 use MongoDB\GridFS\Bucket;
 use MongoDB\Laravel\Cache\MongoStore;
 use MongoDB\Laravel\Eloquent\Model;
 use MongoDB\Laravel\Queue\MongoConnector;
+use MongoDB\Laravel\Scout\ScoutEngine;
 use RuntimeException;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler;
 
@@ -102,6 +105,7 @@ public function register()
         });
 
         $this->registerFlysystemAdapter();
+        $this->registerScoutEngine();
     }
 
     private function registerFlysystemAdapter(): void
@@ -155,4 +159,21 @@ private function registerFlysystemAdapter(): void
             });
         });
     }
+
+    private function registerScoutEngine(): void
+    {
+        $this->app->resolving(EngineManager::class, function (EngineManager $engineManager) {
+            $engineManager->extend('mongodb', function (Container $app) {
+                $connectionName = $app->get('config')->get('scout.mongodb.connection', 'mongodb');
+                $connection = $app->get('db')->connection($connectionName);
+                $softDelete = (bool) $app->get('config')->get('scout.soft_delete', false);
+
+                assert($connection instanceof Connection, new InvalidArgumentException(sprintf('The connection "%s" is not a MongoDB connection.', $connectionName)));
+
+                return new ScoutEngine($connection->getMongoDB(), $softDelete);
+            });
+
+            return $engineManager;
+        });
+    }
 }

src/Scout/MongoDBScoutServiceProvider.php

@@ -7,7 +7,6 @@
 use Illuminate\Support\LazyCollection;
 use Laravel\Scout\ScoutServiceProvider;
 use LogicException;
-use MongoDB\Laravel\Scout\MongoDBScoutServiceProvider;
 use MongoDB\Laravel\Tests\Scout\Models\ScoutUser;
 use MongoDB\Laravel\Tests\Scout\Models\SearchableInSameNamespace;
 use MongoDB\Laravel\Tests\TestCase;
@@ -27,10 +26,7 @@ class ScoutIntegrationTest extends TestCase
     #[Override]
     protected function getPackageProviders($app): array
     {
-        return array_merge(parent::getPackageProviders($app), [
-            ScoutServiceProvider::class,
-            MongoDBScoutServiceProvider::class,
-        ]);
+        return array_merge(parent::getPackageProviders($app), [ScoutServiceProvider::class]);
     }
 
     #[Override]