Alive2212 / LaravelQueryHelper

src/QueryHelper.php

Spacing +16 added lines, -18 removed lines

@@ -35,7 +35,7 @@ 
         $result = $query;
         $keys = explode('.', $filters[0]['key']);
         if (collect($keys)->count() == 2) {
-            $result = $result->orWhereHas($keys[0], function ($query) use ($filters, $keys) {
+            $result = $result->orWhereHas($keys[0], function($query) use ($filters, $keys) {
                 foreach ($filters as $filter) {
                     $keys = explode('.', $filter['key']);
                     $query->where($keys[1], $filter['operator'], $filter['value']);
@@ -100,8 +100,7 @@ 
                 $result = $this->getHierarchyFilterKey($filter);
             }
             $key = $level % 2 == $this->orWhereConditionLevel ?
-                'or_' . $this->queryFilterTitle :
-                'and_' . $this->queryFilterTitle;
+                'or_'.$this->queryFilterTitle : 'and_'.$this->queryFilterTitle;
             $adaptedFilters = array_merge_recursive($adaptedFilters, [$key => $result]);
         }
         return $adaptedFilters;
@@ -139,7 +138,7 @@ 
                 [
                     $firstFilterKey,
                     $firstFilterOperator,
-                    $firstFilterValue == null? null:$firstFilterValue,
+                    $firstFilterValue == null ? null:$firstFilterValue,
                 ],
             ];
         }
@@ -156,7 +155,7 @@ 
     {
         foreach ($filters as $filterKey => $filterValues) {
             $currentFilter = [$filterKey => $filterValues];
-            $model = $model->Where(function ($query) use ($currentFilter) {
+            $model = $model->Where(function($query) use ($currentFilter) {
                 $this->addWhereCondition($query, $currentFilter, $this->orWhereConditionLevel == 0 ? 'and' : 'or');
             });
         }
@@ -197,16 +196,16 @@ 
                         if (
                             strtolower($whereCondition[1]) == "is" ||
                             $whereCondition[1] == "="
-                        ){
+                        ) {
                             $model = $model->whereNull($whereCondition[0]);
-                        } elseif(
+                        } elseif (
                             strtolower($whereCondition[1]) == "not" ||
                             $whereCondition[1] == "<>" ||
                             $whereCondition[1] == "!="
                         ) {
                             $model = $model->whereNotNull($whereCondition[0]);
                         }
-                    }else{
+                    } else {
                         $model = $model->where([$whereCondition]);
                     }
                 }
@@ -219,15 +218,15 @@ 
                 return $this->addWhereCondition($model, $filters, $type, ++$index);
 
             // if and
-            case 'and_' . $this->queryFilterTitle:
+            case 'and_'.$this->queryFilterTitle:
                 // if not first record and type is or
                 if ($type == "or" && $index > 0) {
-                    $model = $model->orWhere(function (Builder $builder) use ($firstFilterValue) {
+                    $model = $model->orWhere(function(Builder $builder) use ($firstFilterValue) {
                         $builder = $this->addWhereCondition($builder, $firstFilterValue, 'and', 0);
                         return $builder;
                     });
                 } else {
-                    $model = $model->where(function (Builder $builder) use ($firstFilterValue) {
+                    $model = $model->where(function(Builder $builder) use ($firstFilterValue) {
                         $builder = $this->addWhereCondition($builder, $firstFilterValue, 'and', 0);
                         return $builder;
                     });
@@ -235,15 +234,15 @@ 
                 break;
 
             // if or
-            case 'or_' . $this->queryFilterTitle:
+            case 'or_'.$this->queryFilterTitle:
                 // if not first record and type is or
                 if ($type == "or" && $index > 0) {
-                    $model = $model->orWhere(function (Builder $builder) use ($firstFilterValue) {
+                    $model = $model->orWhere(function(Builder $builder) use ($firstFilterValue) {
                         $builder = $this->addWhereCondition($builder, $firstFilterValue, 'or', 0);
                         return $builder;
                     });
                 } else {
-                    $model = $model->where(function (Builder $builder) use ($firstFilterValue) {
+                    $model = $model->where(function(Builder $builder) use ($firstFilterValue) {
                         $builder = $this->addWhereCondition($builder, $firstFilterValue, 'or', 0);
                         return $builder;
                     });
@@ -254,12 +253,12 @@ 
             default:
                 // if not first record and type is or
                 if ($type == "or" && $index > 0) {
-                    $model = $model->orWhereHas($firstFilterKey, function (Builder $builder) use ($firstFilterValue) {
+                    $model = $model->orWhereHas($firstFilterKey, function(Builder $builder) use ($firstFilterValue) {
                         $builder = $this->addWhereCondition($builder, $firstFilterValue, 'or', 0);
                         return $builder;
                     });
                 } else {
-                    $model = $model->whereHas($firstFilterKey, function (Builder $builder) use ($firstFilterValue) {
+                    $model = $model->whereHas($firstFilterKey, function(Builder $builder) use ($firstFilterValue) {
                         $builder = $this->addWhereCondition($builder, $firstFilterValue, 'and', 0);
                         return $builder;
                     });
@@ -321,7 +320,6 @@ 
      */
     public function getFilterValue(array $filter): ?string
     {
-        return (array_key_exists('value', $filter)) ? $filter['value'] :
-            ($filter[2] == null ? "null":$filter[2]);
+        return (array_key_exists('value', $filter)) ? $filter['value'] : ($filter[2] == null ? "null" : $filter[2]);
     }
 }