withSort() method and orderBy changes

Author: pdphilip

src/Eloquent/Docs/ModelDocs.php

@@ -55,8 +55,9 @@
  * @method static $this whereNotNestedObject(string $column, Callable $callback, string $scoreType = 'avg')
  * @method static $this firstOrCreate(array $attributes, array $values = [])
  * @method static $this firstOrCreateWithoutRefresh(array $attributes, array $values = [])
- * @method static $this orderBy(string $column, string $direction = 'asc', string $mode = null, array $missing = '_last')
- * @method static $this orderByDesc(string $column, string $mode = null, array $missing = '_last')
+ * @method static $this orderBy(string $column, string $direction = 'asc')
+ * @method static $this orderByDesc(string $column)
+ * @method static $this withSort(string $column, string $key, mixed $value)
  * @method static $this orderByGeo(string $column, array $pin, $direction = 'asc', $unit = 'km', $mode = null, $type = 'arc')
  * @method static $this orderByGeoDesc(string $column, array $pin, $unit = 'km', $mode = null, $type = 'arc')
  * @method static $this orderByNested(string $column, string $direction = 'asc', string $mode = null)

src/Query/Builder.php

@@ -410,7 +410,7 @@ public function aggregate($function, $columns = []): mixed
 
         if (isset($results[0])) {
             $result = (array) $results[0];
-            $esResult = new ElasticResult();
+            $esResult = new ElasticResult;
             $esResult->setQueryMeta($results->getQueryMeta());
             $esResult->setValue($result['aggregate']);
 
@@ -813,29 +813,41 @@ public function whereTimestamp($column, $operator = null, $value = null, $boolea
     /**
      * {@inheritDoc}
      */
-    public function orderByDesc($column, $mode = null, $missing = null): static
+    public function orderByDesc($column): static
     {
-        return $this->orderBy($column, 'desc', $mode, $missing);
+        return $this->orderBy($column, 'desc');
     }
 
     /**
      * {@inheritdoc}
      */
-    public function orderBy($column, $direction = 'asc', $mode = null, $missing = null): static
+    public function orderBy($column, $direction = 'asc'): static
     {
         if (is_string($direction)) {
             $direction = (strtolower($direction) == 'asc' ? 'asc' : 'desc');
         }
 
         $this->orders[$column] = [
             'order' => $direction,
-            'mode' => $mode,
-            'missing' => $missing,
         ];
 
         return $this;
     }
 
+    /**
+     * Including outlier sort functions
+     *
+     * @return $this
+     */
+    public function withSort(string $column, string $key, mixed $value): static
+    {
+        $currentColOrder = $this->orders[$column] ?? [];
+        $currentColOrder[$key] = $value;
+        $this->orders[$column] = $currentColOrder;
+
+        return $this;
+    }
+
     /**
      * @param  $unit  @values: 'km', 'mi', 'm', 'ft'
      * @param  $mode  @values: 'min', 'max', 'avg', 'sum'