Optimizing int related id handling

- Fixes StyleCI

Author: stephandesouza

src/Jenssegers/Mongodb/Helpers/QueriesRelationships.php

@@ -71,7 +71,7 @@ protected function isAcrossConnections(Relation $relation)
     }
 
     /**
-     * Compare across databases
+     * Compare across databases.
      * @param Relation $relation
      * @param string $operator
      * @param int $count
@@ -91,7 +91,7 @@ public function addHybridHas(Relation $relation, $operator = '>=', $count = 1, $
         $not = in_array($operator, ['<', '<=', '!=']);
         // If we are comparing to 0, we need an additional $not flip.
         if ($count == 0) {
-            $not = !$not;
+            $not = ! $not;
         }
 
         $relations = $hasQuery->pluck($this->getHasCompareKey($relation));
@@ -123,9 +123,11 @@ protected function getHasCompareKey(Relation $relation)
     protected function getConstrainedRelatedIds($relations, $operator, $count)
     {
         $intHash = 'INT_RELATION_';
-        $relationCount = array_count_values(array_map(function ($id) use ($intHash) {
-            if (!is_string($id) && is_int($id)) {
-                return $intHash . $id;
+        $hasNumericIndex = false;
+        $relationCount = array_count_values(array_map(function ($id) use ($intHash, &$hasNumericIndex) {
+            if (! is_string($id) && is_int($id)) {
+                $hasNumericIndex = true;
+                return $intHash.$id;
             }
             return (string) $id; // Convert Back ObjectIds to Strings
         }, is_array($relations) ? $relations : $relations->flatten()->toArray()));
@@ -149,16 +151,22 @@ protected function getConstrainedRelatedIds($relations, $operator, $count)
         });
 
         // All related ids.
+        if (! $hasNumericIndex) {
+            return array_keys($relationCount);
+        }
+
+        // Has any numeric index?
         return array_map(static function ($id) use ($intHash) {
             if (strpos($id, $intHash, 0) === 0) {
                 return (int) str_replace($intHash, '', $id);
             }
+
             return (string) $id;
         }, array_keys($relationCount));
     }
 
     /**
-     * Returns key we are constraining this parent model's query with
+     * Returns key we are constraining this parent model's query with.
      * @param Relation $relation
      * @return string
      * @throws Exception
@@ -173,10 +181,10 @@ protected function getRelatedConstraintKey(Relation $relation)
             return $relation->getForeignKeyName();
         }
 
-        if ($relation instanceof BelongsToMany && !$this->isAcrossConnections($relation)) {
+        if ($relation instanceof BelongsToMany && ! $this->isAcrossConnections($relation)) {
             return $this->model->getKeyName();
         }
 
-        throw new Exception(class_basename($relation) . ' is not supported for hybrid query constraints.');
+        throw new Exception(class_basename($relation).' is not supported for hybrid query constraints.');
     }
 }

tests/RelationsTest.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Illuminate\Database\Eloquent\Collection;
@@ -438,10 +439,13 @@ public function testHasManyHas(): void
 
     public function testHasNumeric(): void
     {
-        $author1 = User::create(['_id' => '1', 'name' => 'George R. R. Martin']);
-        $author1->books()->create(['_id' => '1', 'title' => 'A Game of Thrones', 'rating' => 5]);
+        $author1 = User::create(['name' => 'George R. R. Martin']);
+        $author1->books()->create(['title' => 'A Game of Thrones', 'rating' => 5]);
         $author1->books()->create(['_id' => '2', 'title' => 'A Clash of Kings', 'rating' => 5]);
 
+        $author2 = User::create(['name' => 'John Doe']);
+        $author2->books()->create(['title' => 'My book', 'rating' => 2]);
+
         $authors = User::has('books', '>', 1)->get();
         $this->assertCount(1, $authors);
     }