Update all Query\Builder tests to aggregation

Author: GromNaN

src/Query/Builder.php

@@ -28,6 +28,7 @@
 use MongoDB\Builder\Stage\GroupStage;
 use MongoDB\Builder\Stage\LimitStage;
 use MongoDB\Builder\Stage\MatchStage;
+use MongoDB\Builder\Stage\ProjectStage;
 use MongoDB\Builder\Stage\ReplaceRootStage;
 use MongoDB\Builder\Stage\SkipStage;
 use MongoDB\Builder\Stage\SortStage;
@@ -440,15 +441,8 @@ public function toMql(): array
             $projection = array_merge($projection, $this->projections);
         }
 
-        $options = [];
-
-        // Apply order, offset, limit and projection
-        if ($this->timeout) {
-            $options['maxTimeMS'] = $this->timeout * 1000;
-        }
-
         if ($this->orders) {
-            $pipeline[] = new SortStage($this->orders);
+            $pipeline[] = new SortStage(...$this->orders);
         }
 
         if ($this->offset) {
@@ -459,23 +453,22 @@ public function toMql(): array
             $pipeline[] = new LimitStage($this->limit);
         }
 
-        if ($this->hint) {
-            // @todo
-            $options['hint'] = $this->hint;
-        }
-
         if ($projection) {
-            $options['projection'] = $projection;
+            $pipeline[] = new ProjectStage(...$projection);
         }
 
-        // Fix for legacy support, converts the results to arrays instead of objects.
-        $options['typeMap'] = ['root' => 'array', 'document' => 'array'];
+        $options = ['typeMap' => ['root' => 'array', 'document' => 'array']];
+
+        if ($this->timeout) {
+            $options['maxTimeMS'] = $this->timeout * 1000;
+        }
 
-        // Add custom query options
-        if (count($this->options)) {
-            $options = array_merge($options, $this->options);
+        if ($this->hint) {
+            $options['hint'] = $this->hint;
         }
 
+        $options = array_merge($options, $this->options);
+
         $options = $this->inheritConnectionOptions($options);
 
         $encoder = new BuilderEncoder();