fox is_callable function

Author: basemkhirat

src/Classes/Search.php

@@ -44,7 +44,7 @@ public function __construct(Query $query, $q, $settings = NULL)
         $this->query = $query;
         $this->q = $q;
 
-        if(is_callable($settings)){
+        if(is_callback_function($settings)){
             $settings($this);
         }
 

src/Index.php

@@ -142,7 +142,7 @@ public function create()
 
         $callback = $this->callback;
 
-        if (is_callable($callback)) {
+        if (is_callback_function($callback)) {
             $callback($this);
         }
 

src/Query.php

@@ -434,7 +434,7 @@ public function id($_id = false)
     public function where($name, $operator = "=", $value = NULL)
     {
 
-        if (is_callable($name)) {
+        if (is_callback_function($name)) {
             $name($this);
             return $this;
         }
@@ -491,7 +491,7 @@ public function where($name, $operator = "=", $value = NULL)
     public function whereNot($name, $operator = "=", $value = NULL)
     {
 
-        if (is_callable($name)) {
+        if (is_callback_function($name)) {
             $name($this);
             return $this;
         }
@@ -584,7 +584,7 @@ public function whereNotBetween($name, $first_value, $last_value = null)
     public function whereIn($name, $value = [])
     {
 
-        if (is_callable($name)) {
+        if (is_callback_function($name)) {
             $name($this);
             return $this;
         }
@@ -604,7 +604,7 @@ public function whereIn($name, $value = [])
     public function whereNotIn($name, $value = [])
     {
 
-        if (is_callable($name)) {
+        if (is_callback_function($name)) {
             $name($this);
             return $this;
         }
@@ -653,7 +653,7 @@ public function whereExists($name, $exists = true)
     public function distance($name, $value, $distance)
     {
 
-        if (is_callable($name)) {
+        if (is_callback_function($name)) {
             $name($this);
             return $this;
         }
@@ -681,7 +681,7 @@ public function search($q = NULL, $settings = NULL)
 
             $search = new Search($this, $q, $settings);
 
-            if(!is_callable($settings)){
+            if(!is_callback_function($settings)){
                 $search->boost($settings ? $settings : 1);
             }
 
@@ -757,22 +757,22 @@ function body($body = [])
     public function query()
     {
 
-        $query = [
+        $query = [];
 
-            'index' => $this->getIndex(),
+        $query["index"] = $this->getIndex();
 
-            'body' => $this->getBody(),
-
-            "from" => $this->getSkip(),
+        if ($this->getType()) {
+            $query["type"] = $this->getType();
+        }
 
-            "size" => $this->getTake(),
+        $query["body"] = $this->getBody();
 
-            'client' => ['ignore' => $this->ignores]
+        $query["from"] = $this->getSkip();
 
-        ];
+        $query["size"] = $this->getTake();
 
-        if ($this->getType()) {
-            $query["type"] = $this->getType();
+        if(count($this->ignores)){
+            $query["client"] = ['ignore' => $this->ignores];
         }
 
         $search_type = $this->getSearchType();
@@ -1053,7 +1053,7 @@ public function insert($data, $_id = NULL)
     public function bulk($data)
     {
 
-        if (is_callable($data)) {
+        if (is_callback_function($data)) {
 
             $bulk = new Bulk($this);
 

src/helpers.php

@@ -13,3 +13,19 @@ function config_path($path = '')
         return app()->basePath() . '/config' . ($path ? '/' . $path : $path);
     }
 }
+
+if ( ! function_exists('is_callback_function'))
+{
+    /**
+     * Check if a callback function.
+     *
+     * @param  string $callback
+     * @return string
+     */
+    function is_callback_function($callback)
+    {
+        return is_callable($callback) && is_object($callback) && $callback instanceof Closure;
+    }
+}
+
+

tests/Traits/ESQueryTrait.php

@@ -54,12 +54,6 @@ protected function getQueryArray()
 
             'size' => $this->take,
 
-            'client' => [
-
-                'ignore' => []
-
-            ]
-
         ];
     }
 

tests/WhereTest.php

@@ -147,7 +147,6 @@ protected function getExpected($name, $operator = "=", $value = NULL)
 
         $query["body"]["query"]["bool"] = $bool;
 
-
         return $query;
     }