Don't add default sort order on $search pipelines

Results are already ordered by score

Author: GromNaN

src/Doctrine/Odm/Extension/OrderExtension.php

@@ -67,19 +67,22 @@ public function applyToCollection(Builder $aggregationBuilder, string $resourceC
                 if ($this->isPropertyNested($field, $resourceClass)) {
                     [$field] = $this->addLookupsForNestedProperty($field, $aggregationBuilder, $resourceClass, true);
                 }
-                $this->addSort(
-                    $aggregationBuilder,
-                    $context['mongodb_odm_sort_fields'] = ($context['mongodb_odm_sort_fields'] ?? []) + [$field => $order]
-                );
+
+                $context['mongodb_odm_sort_fields'] = ($context['mongodb_odm_sort_fields'] ?? []) + [$field => $order];
+                if ($this->isSearchPipeline($aggregationBuilder)) {
+                    $aggregationBuilder->getStage(0)
+                        ->sort($context['mongodb_odm_sort_fields']);
+                } else {
+                    $aggregationBuilder->sort($context['mongodb_odm_sort_fields']);
+                }
             }
 
             return;
         }
 
-        if (null !== $this->order) {
+        if (null !== $this->order && !$this->isSearchPipeline($aggregationBuilder)) {
             foreach ($identifiers as $identifier) {
-                $this->addSort(
-                    $aggregationBuilder,
+                $aggregationBuilder->sort(
                     $context['mongodb_odm_sort_fields'] = ($context['mongodb_odm_sort_fields'] ?? []) + [$identifier => $this->order]
                 );
             }
@@ -91,18 +94,6 @@ protected function getManagerRegistry(): ManagerRegistry
         return $this->managerRegistry;
     }
 
-    private function addSort(Builder $aggregationBuilder, array $sortFields): void
-    {
-        $firstStage = $aggregationBuilder->getPipeline(0);
-        if ($firstStage instanceof Search) {
-            // The $search stage supports "sort" for performance, it's always first if present
-            $firstStage->sort($sortFields);
-        } else {
-            // Append a $sort stage at the end of the pipeline
-            $aggregationBuilder->sort($sortFields);
-        }
-    }
-
     private function hasSortStage(Builder $aggregationBuilder): bool
     {
         try {
@@ -117,4 +108,14 @@ private function hasSortStage(Builder $aggregationBuilder): bool
             return false;
         }
     }
+
+    private function isSearchPipeline(Builder $aggregationBuilder): bool
+    {
+        try {
+            return $aggregationBuilder->getStage(0) instanceof Search;
+        } catch (\OutOfRangeException) {
+            // Empty pipeline
+            return false;
+        }
+    }
 }