支持闭包

Author: zyimm

composer.json

@@ -15,7 +15,7 @@
   "type": "library",
   "minimum-stability": "dev",
   "require": {
-    "php": ">=7.0",
+    "php": ">=7.1",
     "fideloper/proxy": "^4.0",
     "laravel/framework": ">=5.5"
   },

src/build/resolves/QueryBuilder.php

@@ -3,6 +3,7 @@
 namespace zyimm\query\build\resolves;
 
 
+use Closure;
 use Illuminate\Support\Str;
 
 /**
@@ -20,6 +21,8 @@ class QueryBuilder
 
     public $aliasCount = [];
 
+    private  $call = [];
+
     private $alias, $field, $operator;
 
     /**
@@ -93,13 +96,22 @@ public function build(): array
                 continue;
             }
             // iteration fields
-            foreach ($fields as $field) {
-                if (!isset($this->params[$field])) {
-                    continue;
-                }
+            foreach ($fields as $key => $field) {
                 $this->operator = strtolower($operator);
-                // defineAliasField
-                $this->defineAliasField($field)->handle();
+                if (is_string($field)) {
+                    if (!isset($this->params[$field]) || is_null($this->params[$field])) {
+                        continue;
+                    }
+                    // defineAliasField
+                    $this->defineAliasField($field);
+                }
+                if ($field instanceof Closure) {
+                    $this->call = [
+                        'call'  => $field,
+                        'field' => $key
+                    ];
+                }
+                $this->handle();
             }
         }
         return $this->where;
@@ -109,19 +121,18 @@ public function build(): array
      * defineAliasField
      *
      * @param  string  $field
-     * @return $this
+     * @return void
      */
-    private function defineAliasField(string $field = ''): QueryBuilder
+    private function defineAliasField(string $field = ''): void
     {
         if (stripos($field, '.')) {
             list ($this->alias, $this->field) = explode('.', $field);
-            $this->alias .= '.';
-            array_push($this->aliasCount, $this->alias);
+            $this->alias        .= '.';
+            $this->aliasCount[] = $this->alias;
         } else {
             $this->alias = '';
         }
         $this->field = $field;
-        return $this;
     }
 
     /**
@@ -141,6 +152,24 @@ public function inBetween(): QueryBuilder
         return $this;
     }
 
+    /**
+     * execClosure
+     *
+     * @return $this
+     */
+    public function execClosure(): QueryBuilder
+    {
+        $field = $this->call['field'];
+        if ($this->call['call'] instanceof Closure) {
+            $this->where[$field.$this->operator] = [
+                $field,
+                'where',
+                $this->call['call']
+            ];
+        }
+        return $this;
+    }
+
     /**
      * general
      *