hChamran / laravel-filter

src/Contracts/QueryFilter.php

Braces +17 added lines, -16 removed lines

@@ -36,8 +36,9 @@ 
      */
     public function builder(Builder $query)
     {
-        if (is_null($this->filters))
-            return $query;
+        if (is_null($this->filters)) {
+                    return $query;
+        }
         foreach ($this->filters as $filter) {
             if (is_array($filter[1])) {
                 $query = $query->whereBetween($filter[0], $filter[1]);
@@ -69,8 +70,9 @@ 
      */
     private function requestParser($request)
     {
-        if (empty($request))
-            return;
+        if (empty($request)) {
+                    return;
+        }
 
         $this->chackSortFilter($request);
 
@@ -88,16 +90,15 @@ 
     {
         if (strpos(array_keys($request)[0], 'asc') || strpos(array_keys($request)[0], 'desc')) {
             list($this->filterString, $this->sort) = explode(',', array_keys($request)[0]);
-            if (strpos($this->sort, 'By'))
-                $this->sort = explode('By', $this->sort);
-            else {
+            if (strpos($this->sort, 'By')) {
+                            $this->sort = explode('By', $this->sort);
+            } else {
                 $this->sort = str_split($this->sort, 4);
                 $this->sort[] = $this->getStringFilters();
             }
+        } else {
+                    $this->filterString = array_keys($request)[0];
         }
-
-        else
-            $this->filterString = array_keys($request)[0];
     }
 
     /**
@@ -108,10 +109,11 @@ 
      */
     private function setSortFilter($query)
     {
-        if (is_null($this->sort))
-            return $query;
-        else
-            return $query->orderBy($this->sort[1], $this->sort[0]);
+        if (is_null($this->sort)) {
+                    return $query;
+        } else {
+                    return $query->orderBy($this->sort[1], $this->sort[0]);
+        }
     }
 
     /**
@@ -156,8 +158,7 @@ 
                     $filters[$current][1] = explode('-', $filter[1]);
                 }
                 $current++;
-            }
-            else {
+            } else {
                 unset($filters[$current]);
                 $current++;
             }

src/Helpers/filter.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (! function_exists('getInstanceFilter')) {
+if (!function_exists('getInstanceFilter')) {
     /**
      * Get the available filter instance.
      *
@@ -17,7 +17,7 @@ 
     }
 }
 
-if (! function_exists('filter')) {
+if (!function_exists('filter')) {
     /**
      * Make the filter querty string.
      *