Merge branch '5.x-dev' of github.com:pdphilip/laravel-elasticsearch into 5.x-dev

Author: UseTheFork

src/Query/Builder.php

@@ -2107,16 +2107,12 @@ public function withSuffix(string $suffix): self
 
     public function getLimit(): int
     {
-        return $this->getSetLimit();
+        return $this->getSetLimit() ?? $this->getDefaultLimit() ?? $this->connection->getDefaultLimit();
     }
 
-    public function getSetLimit(): int
+    public function getSetLimit(): ?int
     {
-        // If a limit was explicitly set we use that over the defaults.
-        return $this->limit
-          ?? $this->options()->get('limit')
-          ?? $this->getDefaultLimit()
-          ?? $this->connection->getDefaultLimit();
+        return $this->options()->get('limit', $this->limit) ?? null;
     }
 
     public function getDefaultLimit(): ?int

src/Query/Grammar.php

@@ -548,9 +548,7 @@ public function _buildInnerHits($innerQuery)
             $innerHits['from'] = $innerQuery->offset;
         }
         if ($size = $innerQuery->getSetLimit()) {
-            // TODO: David should we handle this diffrently?
-            // Nested queries have a hard limit of 100 for inner_hits size
-            $innerHits['size'] = min($size, 100);
+            $innerHits['size'] = $size;
         }
 
         return $innerHits;

src/Relations/Traits/QueriesRelationships.php

@@ -27,13 +27,8 @@ trait QueriesRelationships
      *
      * @throws Exception
      */
-    public function has(
-        $relation,
-        $operator = '>=',
-        $count = 1,
-        $boolean = 'and',
-        ?Closure $callback = null
-    ): Builder|static {
+    public function has($relation, $operator = '>=', $count = 1, $boolean = 'and', ?Closure $callback = null): Builder|static
+    {
         if (is_string($relation)) {
             if (str_contains($relation, '.')) {
                 // @phpstan-ignore-next-line
@@ -79,13 +74,8 @@ protected function isAcrossConnections(Relation $relation): bool
      *
      * @throws Exception
      */
-    public function addHybridHas(
-        Relation $relation,
-        string $operator = '>=',
-        int $count = 1,
-        string $boolean = 'and',
-        ?Closure $callback = null
-    ): mixed {
+    public function addHybridHas(Relation $relation, string $operator = '>=', int $count = 1, string $boolean = 'and', ?Closure $callback = null): mixed
+    {
         $hasQuery = $relation->getQuery();
         if ($callback) {
             $hasQuery->callScope($callback);
@@ -102,14 +92,22 @@ public function addHybridHas(
             $relation instanceof MorphToMany => $relation->getInverse() ?
                 $this->handleMorphedByMany($hasQuery, $relation) :
                 $this->handleMorphToMany($hasQuery, $relation),
-            default => $hasQuery->pluck($this->getHasCompareKey($relation))
+            default => $this->handleDefaultForeignIdsLookup($hasQuery, $relation)
         };
 
         $relatedIds = $this->getConstrainedRelatedIds($relations, $operator, $count);
 
         return $this->whereIn($this->getRelatedConstraintKey($relation), $relatedIds, $boolean, $not);
     }
 
+    private function handleDefaultForeignIdsLookup($query, $relation)
+    {
+        $key = $this->getHasCompareKey($relation);
+        $query->whereNotNull($key);
+
+        return $query->pluck($key);
+    }
+
     /**
      * @param  Builder  $hasQuery
      * @param  Relation  $relation

tests/GeospatialTest.php

@@ -40,14 +40,23 @@
 
 it('finds locations within a defined polygon', function () {
 
-    $locations = Location::whereGeoBox('location', ['lon' => -0.1450383, 'lat' => 51.5069158], ['lon' => -0.1270247, 'lat' => 51.5013233])->get();
+    $expectedLon = -0.1392173;
+    $expectedLat = 51.5045037;
+    $topLeft = ['lon' => $expectedLon - 0.0005, 'lat' => $expectedLat + 0.0005];
+    $bottomRight = ['lon' => $expectedLon + 0.0005, 'lat' => $expectedLat - 0.0005];
+
+    $locations = Location::whereGeoBox(
+        'point',
+        $topLeft,
+        $bottomRight,
+    )->get();
 
     expect($locations->count())->toBe(1);
 
-    $locations->get()->each(function ($item) {
-        expect($item->name)->toBe('StJamesPalace');
+    $locations->each(function ($item) {
+        expect($item->name)->toBe('St. James\'s Palace');
     });
-})->todo('need to add more checks around geo bounding box');
+});
 
 it('finds locations near a point within max distance', function () {
     $locations = Location::whereGeoDistance('point', '200m', ['lat' => 51.5049537, 'lon' => -0.1392173])->get();

tests/ModelTest.php

@@ -457,7 +457,7 @@
     });
 
     expect($names)->toBe(['fork', 'spork', 'spoon']);
-})->todo();
+});
 
 it('tests chunk across many items', function () {
     $users = [];

tests/Models/Group.php

@@ -17,7 +17,7 @@ class Group extends Model
 
     protected static $unguarded = true;
 
-    public function users(): BelongsToMany
+    public function groupUsers(): BelongsToMany
     {
         return $this->belongsToMany(User::class, 'users', 'groups', 'users', 'id', 'id', 'users');
     }

tests/Models/User.php

@@ -89,7 +89,7 @@ public function clients()
         return $this->belongsToMany(Client::class);
     }
 
-    public function groups()
+    public function userGroups()
     {
         return $this->belongsToMany(Group::class, 'groups', 'users', 'groups', 'id', 'id', 'groups');
     }

tests/RelationsTest.php

@@ -321,22 +321,22 @@
 
 it('tests belongs to many custom', function () {
     $user = User::create(['name' => 'John Doe']);
-    $group = $user->groups()->create(['name' => 'Admins']);
+    $group = $user->userGroups()->create(['name' => 'Admins']);
 
-    // Refetch
+    // Re-fetch
     $user = User::find($user->id);
     $group = Group::find($group->id);
 
     // Check for custom relation attributes
     expect($group->getAttributes())->toHaveKey('users')
         ->and($user->getAttributes())->toHaveKey('groups')
-        ->and($user->groups->pluck('id')->toArray())->toContain($group->id)
-        ->and($group->users->pluck('id')->toArray())->toContain($user->id)
-        ->and($user->groups()->first()->id)->toBe($group->id)
-        ->and($group->users()->first()->id)->toBe($user->id);
+        ->and($user->userGroups->pluck('id')->toArray())->toContain($group->id)
+        ->and($group->groupUsers->pluck('id')->toArray())->toContain($user->id)
+        ->and($user->userGroups()->first()->id)->toBe($group->id)
+        ->and($group->groupUsers()->first()->id)->toBe($user->id);
 
     // Assert they are attached
-})->todo();
+});
 
 it('tests morph', function () {
     $user = User::create(['name' => 'John Doe']);
@@ -854,7 +854,7 @@
         $query->where('rating', '<', 5);
     })->get();
     expect($authors)->toHaveCount(1);
-})->todo();
+});
 
 it('tests has one has', function () {
     $user1 = User::create(['name' => 'John Doe']);
@@ -874,7 +874,7 @@
 
     $users = User::has('role', '!=', 0)->get();
     expect($users)->toHaveCount(2);
-})->todo();
+});
 
 it('tests nested keys', function () {
     $client = Client::create([