Remove use of compact function

mongodb · Dec 27, 2024 · 74d3005 · 74d3005
1 parent 7bf4f2d
commit 74d3005
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/src/Eloquent/Builder.php b/src/Eloquent/Builder.php
@@ -5,7 +5,6 @@
 namespace MongoDB\Laravel\Eloquent;
 
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-use Illuminate\Support\Collection;
 use MongoDB\BSON\Document;
 use MongoDB\Driver\CursorInterface;
 use MongoDB\Driver\Exception\WriteException;
@@ -17,7 +16,6 @@
 use function array_key_exists;
 use function array_merge;
 use function collect;
-use function compact;
 use function is_array;
 use function is_object;
 use function iterator_to_array;
@@ -51,6 +49,7 @@ class Builder extends EloquentBuilder
         'insertusing',
         'max',
         'min',
+        'autocomplete',
         'pluck',
         'pull',
         'push',
@@ -78,11 +77,6 @@ public function search(...$args)
         return $this->model->hydrate($results->all());
     }
 
-    public function autocomplete(string $path, string $query, bool|array $fuzzy = false, string $tokenOrder = 'any'): Collection
-    {
-        return $this->toBase()->autocomplete(...compact('path', 'query', 'fuzzy', 'tokenOrder'));
-    }
-
     /** @inheritdoc */
     public function update(array $values, array $options = [])
     {

diff --git a/src/Query/Builder.php b/src/Query/Builder.php
@@ -42,7 +42,6 @@
 use function blank;
 use function call_user_func;
 use function call_user_func_array;
-use function compact;
 use function count;
 use function ctype_xdigit;
 use function date_default_timezone_get;
@@ -1531,11 +1530,11 @@ public function search(
     /** @return Collection<string> */
     public function autocomplete(string $path, string $query, bool|array $fuzzy = false, string $tokenOrder = 'any'): Collection
     {
-        $args = compact('path', 'query', 'fuzzy', 'tokenOrder');
-        if ($args['fuzzy'] === true) {
+        $args = ['path' => $path, 'query' => $query, 'tokenOrder' => $tokenOrder];
+        if ($fuzzy === true) {
             $args['fuzzy'] = ['maxEdits' => 2];
-        } elseif ($args['fuzzy'] === false) {
-            unset($args['fuzzy']);
+        } elseif ($fuzzy !== false) {
+            $args['fuzzy'] = $fuzzy;
         }
 
         return $this->aggregate()->search(

diff --git a/tests/AtlasSearchTest.php b/tests/AtlasSearchTest.php
@@ -2,8 +2,10 @@
 
 namespace MongoDB\Laravel\Tests;
 
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+use Illuminate\Support\Collection as LaravelCollection;
 use MongoDB\Builder\Search;
-use MongoDB\Collection;
+use MongoDB\Collection as MongoDBCollection;
 use MongoDB\Driver\Exception\ServerException;
 use MongoDB\Laravel\Tests\Models\Book;
 
@@ -41,7 +43,7 @@ public function setUp(): void
         ]);
 
         $collection = $this->getConnection('mongodb')->getCollection('books');
-        assert($collection instanceof Collection);
+        assert($collection instanceof MongoDBCollection);
         try {
             $collection->createSearchIndex([
                 'mappings' => [
@@ -85,7 +87,7 @@ public function testEloquentBuilderSearch()
     {
         $results = Book::search(Search::text('title', 'systems'));
 
-        self::assertInstanceOf(\Illuminate\Database\Eloquent\Collection::class, $results);
+        self::assertInstanceOf(EloquentCollection::class, $results);
         self::assertCount(3, $results);
         self::assertInstanceOf(Book::class, $results->first());
         self::assertSame([
@@ -100,7 +102,7 @@ public function testDatabaseBuilderSearch()
         $results = $this->getConnection('mongodb')->table('books')
             ->search(Search::text('title', 'systems'));
 
-        self::assertInstanceOf(\Illuminate\Support\Collection::class, $results);
+        self::assertInstanceOf(LaravelCollection::class, $results);
         self::assertCount(3, $results);
         self::assertIsArray($results->first());
         self::assertSame([
@@ -114,7 +116,7 @@ public function testEloquentBuilderAutocomplete()
     {
         $results = Book::autocomplete('title', 'system');
 
-        self::assertInstanceOf(\Illuminate\Support\Collection::class, $results);
+        self::assertInstanceOf(LaravelCollection::class, $results);
         self::assertCount(3, $results);
         self::assertSame([
             'Operating System Concepts',
@@ -128,7 +130,7 @@ public function testDatabaseBuilderAutocomplete()
         $results = $this->getConnection('mongodb')->table('books')
             ->autocomplete('title', 'system');
 
-        self::assertInstanceOf(\Illuminate\Support\Collection::class, $results);
+        self::assertInstanceOf(LaravelCollection::class, $results);
         self::assertCount(3, $results);
         self::assertSame([
             'Operating System Concepts',