Fix $geoNear stage with empty query

Author: GromNaN

lib/Doctrine/ODM/MongoDB/Aggregation/Builder.php

@@ -14,6 +14,7 @@
 use GeoJson\Geometry\Point;
 use MongoDB\Collection;
 use OutOfRangeException;
+use stdClass;
 use TypeError;
 
 use function array_map;
@@ -313,7 +314,7 @@ public function getPipeline(/* bool $applyFilters = true */): array
         }
 
         $matchExpression = $this->applyFilters([]);
-        if ($matchExpression !== []) {
+        if ((array) $matchExpression !== []) {
             array_unshift($pipeline, ['$match' => $matchExpression]);
         }
 
@@ -698,15 +699,23 @@ public function addStage(Stage $stage): Stage
      *
      * @param array<string, mixed> $query
      *
-     * @return array<string, mixed>
+     * @return array<string, mixed>|stdClass
      */
-    private function applyFilters(array $query): array
+    private function applyFilters(array|stdClass $query): array|stdClass
     {
+        if (! is_array($query)) {
+            $query = (array) $query;
+        }
+
         $documentPersister = $this->getDocumentPersister();
 
         $query = $documentPersister->addDiscriminatorToPreparedQuery($query);
         $query = $documentPersister->addFilterToPreparedQuery($query);
 
+        if ($query === []) {
+            return (object) $query;
+        }
+
         return $query;
     }
 

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GeoNear.php

@@ -6,6 +6,7 @@
 
 use Doctrine\ODM\MongoDB\Aggregation\Builder;
 use GeoJson\Geometry\Point;
+use stdClass;
 
 use function is_array;
 
@@ -46,11 +47,12 @@ public function __construct(Builder $builder, $x, $y = null)
 
     public function getExpression(): array
     {
+        $query   = $this->query->getQuery();
         $geoNear = [
             'near' => $this->near,
             'spherical' => $this->spherical,
             'distanceField' => $this->distanceField,
-            'query' => $this->query->getQuery(),
+            'query' => $query ?: new stdClass(),
             'distanceMultiplier' => $this->distanceMultiplier,
             'includeLocs' => $this->includeLocs,
             'maxDistance' => $this->maxDistance,

tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/GeoNearTest.php

@@ -8,6 +8,7 @@
 use Doctrine\ODM\MongoDB\Tests\Aggregation\AggregationTestTrait;
 use Doctrine\ODM\MongoDB\Tests\BaseTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
+use stdClass;
 
 class GeoNearTest extends BaseTestCase
 {
@@ -72,7 +73,11 @@ public function testLimitDoesNotCreateExtraStage(): void
             ->geoNear(0, 0)
             ->limit(1);
 
-        $stage = ['near' => [0, 0], 'spherical' => false, 'distanceField' => null, 'query' => [], 'num' => 1];
-        self::assertSame([['$geoNear' => $stage]], $builder->getPipeline());
+        $stage = $builder->getPipeline()[0];
+        self::assertSame([0, 0], $stage['$geoNear']['near']);
+        self::assertFalse($stage['$geoNear']['spherical']);
+        self::assertNull($stage['$geoNear']['distanceField']);
+        self::assertEquals(new stdClass(), $stage['$geoNear']['query']);
+        self::assertSame(1, $stage['$geoNear']['num']);
     }
 }

tests/Doctrine/ODM/MongoDB/Tests/Functional/GeoTest.php

@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\ODM\MongoDB\Tests\Functional;
+
+use Doctrine\ODM\MongoDB\Tests\BaseTestCase;
+use Documents\Place;
+
+class GeoTest extends BaseTestCase
+{
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->dm->getSchemaManager()->ensureDocumentIndexes(Place::class);
+        $this->dm->persist(new Place(
+            name: 'Central Park',
+            location: ['type' => 'Point', 'coordinates' => [-73.97, 40.77]],
+            category: 'Parks',
+        ));
+        $this->dm->persist(new Place(
+            name: 'Sara D. Roosevelt Park',
+            location: ['type' => 'Point', 'coordinates' => [-73.9928, 40.7193]],
+            category: 'Parks',
+        ));
+        $this->dm->persist(new Place(
+            name: 'Polo Grounds',
+            location: ['type' => 'Point', 'coordinates' => [-73.9928, 40.7193]],
+            category: 'Stadiums',
+        ));
+        $this->dm->flush();
+    }
+
+    public function testGeoNearWithQuery(): void
+    {
+        $pipeline = $this->dm->createAggregationBuilder(Place::class)
+            ->geoNear(-73.99279, 40.719296)
+                ->field('category')->equals('Parks')
+                ->distanceField('calculated')
+                ->maxDistance(2)
+                ->spherical(true)
+            ->getAggregation();
+
+        $results = $pipeline->execute()->toArray();
+        self::assertCount(2, $results);
+        self::assertSame('Sara D. Roosevelt Park', $results[0]['name']);
+        self::assertIsFloat($results[0]['calculated']);
+    }
+
+    public function testGeoNearWithEmptyQuery(): void
+    {
+        $pipeline = $this->dm->createAggregationBuilder(Place::class)
+            ->geoNear(-73.99279, 40.719296)
+                ->distanceField('dist.calculated')
+                ->maxDistance(2)
+                ->includeLocs('dist.location')
+                ->spherical(true)
+            ->getAggregation();
+
+        $results = $pipeline->execute()->toArray();
+        self::assertCount(3, $results);
+        self::assertSame('Sara D. Roosevelt Park', $results[0]['name']);
+        self::assertIsArray($results[0]['dist']);
+        self::assertIsArray($results[0]['dist']['location']);
+        self::assertIsFloat($results[0]['dist']['calculated']);
+    }
+}

tests/Documents/Place.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Documents;
+
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+
+/** For testing $geoNear and other geographic operators */
+#[ODM\Document(collection: 'places')]
+#[ODM\Index(keys: ['location' => '2dsphere'])]
+class Place
+{
+    #[ODM\Id]
+    public ?string $id;
+
+    public function __construct(
+        #[ODM\Field]
+        public string $name,
+        // Geometry object
+        #[ODM\Field]
+        public array $location,
+        #[ODM\Field]
+        public string $category,
+    ) {
+    }
+}