order by _score bug

+ edge-case where option string is a callable

Author: pdphilip

src/Query/Builder.php

@@ -458,7 +458,7 @@ public function orderBy($column, $direction = 1, array $options = []): self
         if (is_string($direction)) {
             $direction = strtolower($direction) == 'asc' ? 1 : -1;
         }
-        if (in_array($column, ['_score', '_count'])) {
+        if (in_array($column, ['_count'])) {
             $this->sorts[$column] = $direction;
 
             return $this;

src/Query/ManagesOptions.php

@@ -79,7 +79,7 @@ public function extractSearch($columns = null, $options = []): array
         if ($options) {
             return [$columns, $options];
         }
-        if (is_callable($columns)) {
+        if (is_callable($columns) && ! is_string($columns)) {
             $options = $columns;
             $columns = null;
 
@@ -100,7 +100,7 @@ public function extractSearch($columns = null, $options = []): array
 
     protected function extractOptionsFull($type, $column, $operator, $value, $boolean, $not, $options = []): array
     {
-        if (is_callable($column)) {
+        if (is_callable($column) && ! is_string($column)) {
             // The query is a closure, return it as is
             return [$column, $operator, $value, $boolean, $not, $options];
         }
@@ -129,7 +129,7 @@ protected function extractOptionsFull($type, $column, $operator, $value, $boolea
         }
         $allowedOptions = $this->returnAllowedOptions();
 
-        if ($value) {
+        if ($value && ! is_string($value)) {
             // If either is callable or an array containing valid operators, then we have options
             if (is_callable($value) || (is_array($value) && count(array_intersect(array_keys($value), $allowedOptions)))) {
                 $options = $this->parseOptions($value);
@@ -141,7 +141,7 @@ protected function extractOptionsFull($type, $column, $operator, $value, $boolea
         }
 
         // Last, let's assess the operator
-        if ($operator) {
+        if ($operator && ! is_string($operator)) {
             // If either is callable or an array containing valid operators, then we have options
             if (is_callable($operator) || (is_array($operator) && count(array_intersect(array_keys($operator), $allowedOptions)))) {
                 $options = $this->parseOptions($operator);