alohajaycee / laravel-traversify

src/Traversify.php

Braces +43 added lines, -15 removed lines

@@ -47,9 +47,11 @@ 
 
             return \DB::getQueryLog();
 
-        else:
+        else {
+            :
 
             return $result;
+        }
 
         endif;
     }
@@ -67,14 +69,18 @@ 
 
     private function __queryCustom()
     {
-        if(!isset($this->custom)) return;
+        if(!isset($this->custom)) {
+            return;
+        }
 
         $this->query->where($this->custom);
     }
 
     private function __querySearch()
     {
-        if(!isset(self::$searchables)) return;
+        if(!isset(self::$searchables)) {
+            return;
+        }
 
         $this->query->where( function($query)
         {
@@ -88,8 +94,10 @@ 
                       {
                           $query->where($_searchable[1],'LIKE','%'.$this->search.'%');    
                       });
-                  else:
-                      $query->orWhere($searchable,'LIKE','%'.$this->search.'%');     
+                  else {
+                      :
+                      $query->orWhere($searchable,'LIKE','%'.$this->search.'%');
+                  }
                   endif;
 
             endforeach;
@@ -98,7 +106,9 @@ 
 
     private function __queryFilter()
     {
-        if(!isset(self::$filterables)) return;
+        if(!isset(self::$filterables)) {
+            return;
+        }
         
         $this->query->where(function($query)
         {
@@ -123,9 +133,11 @@ 
                                 $query->whereNotIn($relationship[1],$values);                                    
                             });
 
-                        else:
+                        else {
+                            :
                 
                             $values = explode(',',$value);
+                        }
 
                             $query->with($relationship[0])->whereHas($relationship[0],function($query) use ( $relationship, $values, $value)
                             {
@@ -134,19 +146,23 @@ 
                             
                         endif;
 
-                    else:
+                    else {
+                        :
                         if($value[0]=='!'):
 
                             $values = explode(',',substr($value,1));
+                    }
         
                             $query->where(function($query) use ($attribute, $values)
                             {
                                 $query->whereNotIn($attribute,$values);
                             });
                             
-                        else:
+                        else {
+                            :
                 
                             $values = explode(',',$value);
+                        }
                             
                             count($values) > 1 ? $query->whereIn($attribute,$values) : $query->where($attribute,$value);
     
@@ -162,7 +178,9 @@ 
 
     private function __queryRange()
     {
-        if(!isset(self::$rangables)) return;
+        if(!isset(self::$rangables)) {
+            return;
+        }
 
         $this->query->where(function($query)
         {
@@ -183,9 +201,11 @@ 
                                 $query->whereNotBetween($relationship[1],$values);                                    
                             });
 
-                        else:
+                        else {
+                            :
                 
                             $values = explode(',',$value);
+                        }
 
                             $query->with($relationship[0])->whereHas($relationship[0],function($query) use ( $relationship, $values, $value)
                             {
@@ -194,20 +214,24 @@ 
                             
                         endif;
 
-                    else:
+                    else {
+                        :
 
                         if($value[0]=='!'):
 
                             $values = explode(',',substr($value,1));
+                    }
         
                             $query->where(function($q) use ($attribute, $values)
                             {
                                 $q->whereNotBetween($attribute,$values);
                             });
                             
-                        else:
+                        else {
+                            :
 
                             $values = explode(',',$value);
+                        }
         
                             $query->whereBetween($attribute,$values);
         
@@ -223,7 +247,9 @@ 
 
     private function __queryOrder()
     {
-        if(!isset(self::$orderables)) return;
+        if(!isset(self::$orderables)) {
+            return;
+        }
 
         foreach($this->order ?: [] as $attribute => $value):
 
@@ -238,9 +264,11 @@ 
                         $query->orderBy($relationship[1],$value); 
                     }]);
 
-                else:
+                else {
+                    :
 
                     $this->query->orderBy($attribute, $value);
+                }
 
                 endif;