diff --git a/composer.json b/composer.json index a6db3e2..a507632 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,8 @@ "laravel/framework": ">=5.5" }, "require-dev": { - "barryvdh/laravel-debugbar": "^3.0.0" + "barryvdh/laravel-debugbar": "^3.0.0", + "phpunit/phpunit": "8.5.x-dev" }, "autoload": { "psr-4": { @@ -38,11 +39,5 @@ "zyimm\\query\\QueryBuilderServiceProvider" ] } - }, - "repositories": [ - { - "type": "composer", - "url": "https://mirrors.aliyun.com/composer/" - } - ] + } } diff --git a/src/QueryBuilderServiceProvider.php b/src/QueryBuilderServiceProvider.php index 20a8f8a..6c61abe 100644 --- a/src/QueryBuilderServiceProvider.php +++ b/src/QueryBuilderServiceProvider.php @@ -1,33 +1,33 @@ -app->bind('QueryWhere', QueryWhere::class); - } - -} +app->bind('QueryWhere', QueryWhere::class); + } + +} diff --git a/src/build/QueryWhere.php b/src/build/QueryWhere.php index c4a4cc4..dd83856 100644 --- a/src/build/QueryWhere.php +++ b/src/build/QueryWhere.php @@ -1,50 +1,50 @@ -build(); - //自动执行闭包查询 - $this->executeQuery($where, $query); - } - - /** - * Execute closure query - * - * @param $where - * @param $query Builder - */ - private function executeQuery($where, Builder &$query) - { - foreach ($where as $extra) { - if (stripos($extra[1],'.') !== false) { - $operator = explode('.', $extra[1]); - $extra[1] = reset($operator); - $operator = array_pop($operator); - } else { - $operator = $extra[1]; - unset($extra[1]); - } - call_user_func_array([$query, $operator], $extra); - } - } -} +build(); + //自动执行闭包查询 + $this->executeQuery($where, $query); + } + + /** + * Execute closure query + * + * @param $where + * @param $query Builder + */ + private function executeQuery($where, Builder $query) + { + foreach ($where as $extra) { + if (stripos($extra[1],'.') !== false) { + $operator = explode('.', $extra[1]); + $extra[1] = reset($operator); + $operator = array_pop($operator); + } else { + $operator = $extra[1]; + unset($extra[1]); + } + call_user_func_array([$query, $operator], $extra); + } + } +}