Fixes #277: Prevent accidental string matches for global functions

matchory · Apr 12, 2023 · ca4cdc7 · ca4cdc7
1 parent 8390e21
commit ca4cdc7
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/Concerns/BuildsFluentQueries.php b/src/Concerns/BuildsFluentQueries.php
@@ -4,6 +4,7 @@
 
 namespace Matchory\Elasticsearch\Concerns;
 
+use Closure;
 use InvalidArgumentException;
 use JetBrains\PhpStorm\Deprecated;
 use Matchory\Elasticsearch\Classes\Search;
@@ -459,7 +460,7 @@ public function body(array $body = []): self
      */
     public function distance($name, $value, string $distance): self
     {
-        if (is_callable($name)) {
+        if ($name instanceof Closure) {
             return tap($this, $name);
         }
 
@@ -1085,7 +1086,7 @@ public function where(
         $operator = Query::OPERATOR_EQUAL,
         $value = null
     ): self {
-        if (is_callable($name)) {
+        if ($name instanceof Closure) {
             $name($this);
 
             return $this;
@@ -1209,7 +1210,7 @@ public function whereExists(string $name, bool $exists = true): self
      */
     public function whereIn($name, $value = []): self
     {
-        if (is_callable($name)) {
+        if ($name instanceof Closure) {
             return tap($this, $name);
         }
 
@@ -1230,7 +1231,7 @@ public function whereNot(
         string $operator = Query::OPERATOR_EQUAL,
         $value = null
     ): self {
-        if (is_callable($name)) {
+        if ($name instanceof Closure) {
             return tap($this, $name);
         }
 
@@ -1318,7 +1319,7 @@ public function whereNotBetween(
      */
     public function whereNotIn($name, $value = []): self
     {
-        if (is_callable($name)) {
+        if ($name instanceof Closure) {
             return tap($this, $name);
         }