Skip to content

Commit 71fd529

Browse files
committed
Remove use of compact function
1 parent b096461 commit 71fd529

File tree

3 files changed

+12
-18
lines changed

3 files changed

+12
-18
lines changed

src/Eloquent/Builder.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace MongoDB\Laravel\Eloquent;
66

77
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
8-
use Illuminate\Support\Collection;
98
use MongoDB\BSON\Document;
109
use MongoDB\Driver\CursorInterface;
1110
use MongoDB\Driver\Exception\WriteException;
@@ -17,7 +16,6 @@
1716
use function array_key_exists;
1817
use function array_merge;
1918
use function collect;
20-
use function compact;
2119
use function is_array;
2220
use function is_object;
2321
use function iterator_to_array;
@@ -51,6 +49,7 @@ class Builder extends EloquentBuilder
5149
'insertusing',
5250
'max',
5351
'min',
52+
'autocomplete',
5453
'pluck',
5554
'pull',
5655
'push',
@@ -78,11 +77,6 @@ public function search(...$args)
7877
return $this->model->hydrate($results->all());
7978
}
8079

81-
public function autocomplete(string $path, string $query, bool|array $fuzzy = false, string $tokenOrder = 'any'): Collection
82-
{
83-
return $this->toBase()->autocomplete(...compact('path', 'query', 'fuzzy', 'tokenOrder'));
84-
}
85-
8680
/** @inheritdoc */
8781
public function update(array $values, array $options = [])
8882
{

src/Query/Builder.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
use function blank;
4343
use function call_user_func;
4444
use function call_user_func_array;
45-
use function compact;
4645
use function count;
4746
use function ctype_xdigit;
4847
use function date_default_timezone_get;
@@ -1531,11 +1530,11 @@ public function search(
15311530
/** @return Collection<string> */
15321531
public function autocomplete(string $path, string $query, bool|array $fuzzy = false, string $tokenOrder = 'any'): Collection
15331532
{
1534-
$args = compact('path', 'query', 'fuzzy', 'tokenOrder');
1535-
if ($args['fuzzy'] === true) {
1533+
$args = ['path' => $path, 'query' => $query, 'tokenOrder' => $tokenOrder];
1534+
if ($fuzzy === true) {
15361535
$args['fuzzy'] = ['maxEdits' => 2];
1537-
} elseif ($args['fuzzy'] === false) {
1538-
unset($args['fuzzy']);
1536+
} elseif ($fuzzy !== false) {
1537+
$args['fuzzy'] = $fuzzy;
15391538
}
15401539

15411540
return $this->aggregate()->search(

tests/AtlasSearchTest.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
namespace MongoDB\Laravel\Tests;
44

5-
use Illuminate\Database\Eloquent\Collection;
5+
use Illuminate\Database\Eloquent\Collection as EloquentCollection;
6+
use Illuminate\Support\Collection as LaravelCollection;
67
use Illuminate\Support\Facades\Schema;
78
use MongoDB\Builder\Search;
89
use MongoDB\Collection as MongoDBCollection;
@@ -44,8 +45,8 @@ public function setUp(): void
4445
]);
4546

4647
$collection = $this->getConnection('mongodb')->getCollection('books');
47-
4848
assert($collection instanceof MongoDBCollection);
49+
4950
try {
5051
$collection->createSearchIndex([
5152
'mappings' => [
@@ -143,7 +144,7 @@ public function testEloquentBuilderSearch()
143144
{
144145
$results = Book::search(Search::text('title', 'systems'));
145146

146-
self::assertInstanceOf(Collection::class, $results);
147+
self::assertInstanceOf(EloquentCollection::class, $results);
147148
self::assertCount(3, $results);
148149
self::assertInstanceOf(Book::class, $results->first());
149150
self::assertSame([
@@ -158,7 +159,7 @@ public function testDatabaseBuilderSearch()
158159
$results = $this->getConnection('mongodb')->table('books')
159160
->search(Search::text('title', 'systems'));
160161

161-
self::assertInstanceOf(\Illuminate\Support\Collection::class, $results);
162+
self::assertInstanceOf(LaravelCollection::class, $results);
162163
self::assertCount(3, $results);
163164
self::assertIsArray($results->first());
164165
self::assertSame([
@@ -172,7 +173,7 @@ public function testEloquentBuilderAutocomplete()
172173
{
173174
$results = Book::autocomplete('title', 'system');
174175

175-
self::assertInstanceOf(\Illuminate\Support\Collection::class, $results);
176+
self::assertInstanceOf(LaravelCollection::class, $results);
176177
self::assertCount(3, $results);
177178
self::assertSame([
178179
'Operating System Concepts',
@@ -186,7 +187,7 @@ public function testDatabaseBuilderAutocomplete()
186187
$results = $this->getConnection('mongodb')->table('books')
187188
->autocomplete('title', 'system');
188189

189-
self::assertInstanceOf(\Illuminate\Support\Collection::class, $results);
190+
self::assertInstanceOf(LaravelCollection::class, $results);
190191
self::assertCount(3, $results);
191192
self::assertSame([
192193
'Operating System Concepts',

0 commit comments

Comments
 (0)