Skip to content

Commit 74d3005

Browse files
committed
Remove use of compact function
1 parent 7bf4f2d commit 74d3005

File tree

3 files changed

+13
-18
lines changed

3 files changed

+13
-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: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
namespace MongoDB\Laravel\Tests;
44

5+
use Illuminate\Database\Eloquent\Collection as EloquentCollection;
6+
use Illuminate\Support\Collection as LaravelCollection;
57
use MongoDB\Builder\Search;
6-
use MongoDB\Collection;
8+
use MongoDB\Collection as MongoDBCollection;
79
use MongoDB\Driver\Exception\ServerException;
810
use MongoDB\Laravel\Tests\Models\Book;
911

@@ -41,7 +43,7 @@ public function setUp(): void
4143
]);
4244

4345
$collection = $this->getConnection('mongodb')->getCollection('books');
44-
assert($collection instanceof Collection);
46+
assert($collection instanceof MongoDBCollection);
4547
try {
4648
$collection->createSearchIndex([
4749
'mappings' => [
@@ -85,7 +87,7 @@ public function testEloquentBuilderSearch()
8587
{
8688
$results = Book::search(Search::text('title', 'systems'));
8789

88-
self::assertInstanceOf(\Illuminate\Database\Eloquent\Collection::class, $results);
90+
self::assertInstanceOf(EloquentCollection::class, $results);
8991
self::assertCount(3, $results);
9092
self::assertInstanceOf(Book::class, $results->first());
9193
self::assertSame([
@@ -100,7 +102,7 @@ public function testDatabaseBuilderSearch()
100102
$results = $this->getConnection('mongodb')->table('books')
101103
->search(Search::text('title', 'systems'));
102104

103-
self::assertInstanceOf(\Illuminate\Support\Collection::class, $results);
105+
self::assertInstanceOf(LaravelCollection::class, $results);
104106
self::assertCount(3, $results);
105107
self::assertIsArray($results->first());
106108
self::assertSame([
@@ -114,7 +116,7 @@ public function testEloquentBuilderAutocomplete()
114116
{
115117
$results = Book::autocomplete('title', 'system');
116118

117-
self::assertInstanceOf(\Illuminate\Support\Collection::class, $results);
119+
self::assertInstanceOf(LaravelCollection::class, $results);
118120
self::assertCount(3, $results);
119121
self::assertSame([
120122
'Operating System Concepts',
@@ -128,7 +130,7 @@ public function testDatabaseBuilderAutocomplete()
128130
$results = $this->getConnection('mongodb')->table('books')
129131
->autocomplete('title', 'system');
130132

131-
self::assertInstanceOf(\Illuminate\Support\Collection::class, $results);
133+
self::assertInstanceOf(LaravelCollection::class, $results);
132134
self::assertCount(3, $results);
133135
self::assertSame([
134136
'Operating System Concepts',

0 commit comments

Comments
 (0)