crocodic-studio / crudbooster

src/controllers/traits/Query.php

Spacing +26 added lines, -26 removed lines

@@ -24,13 +24,13 @@ 
 
         $query->addSelect($this->data['table'].'.'.cb()->pk($this->data['table']).' as primary_key');
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
-        if($softDelete === true && SchemaHelper::hasColumn($this->data['table'],'deleted_at')) {
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
+        if ($softDelete === true && SchemaHelper::hasColumn($this->data['table'], 'deleted_at')) {
             $query->whereNull($this->data['table'].'.deleted_at');
         }
 
-        if(isset($joins)) {
-            foreach($joins as $join)
+        if (isset($joins)) {
+            foreach ($joins as $join)
             {
                 $query->join($join['target_table'],
                     $join['target_table_primary'],
@@ -40,14 +40,14 @@ 
             }
         }
 
-        foreach($columns as $column) {
+        foreach ($columns as $column) {
             /** @var ColumnModel $column */
-            if($column->getType() != "custom") {
-                if(strpos($column->getField(),".") === false) {
-                    if(SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
+            if ($column->getType() != "custom") {
+                if (strpos($column->getField(), ".") === false) {
+                    if (SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
                         $query->addSelect($this->data['table'].'.'.$column->getField());
                     }
-                }else{
+                } else {
                     $query->addSelect($column->getField());
                 }
             }
@@ -55,21 +55,21 @@ 
             $query = getTypeHook($column->getType())->query($query, $column);
         }
 
-        if(request()->has('q'))
+        if (request()->has('q'))
         {
             $keyword = sanitizeXSS(request("q"));
-            if(isset($this->data['hook_search_query'])) {
+            if (isset($this->data['hook_search_query'])) {
                 $query = call_user_func($this->data['hook_search_query'], $query);
-            }else{
-                $query->where(function ($where) use ($columns, $keyword) {
+            } else {
+                $query->where(function($where) use ($columns, $keyword) {
                     /**
                      * @var $where Builder
                      */
-                    foreach($columns as $column)
+                    foreach ($columns as $column)
                     {
-                        if(strpos($column->getField(),".") === false) {
+                        if (strpos($column->getField(), ".") === false) {
                             $field = $this->data['table'].'.'.$column->getField();
-                        }else{
+                        } else {
                             $field = $column->getField();
                         }
                         $where->orWhere($field, 'like', '%'.$keyword.'%');
@@ -82,36 +82,36 @@ 
         /*
          * This script to hanlde the callback inputed on this query method
          */
-        if(isset($callback) && is_callable($callback)) {
+        if (isset($callback) && is_callable($callback)) {
             $query = call_user_func($callback, $query);
         }
 
-        if(isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) {
+        if (isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) {
             $query = call_user_func($this->data['hook_index_query'], $query);
         }
 
 
-        if(request()->has(['order_by','order_sort']))
+        if (request()->has(['order_by', 'order_sort']))
         {
-            $sort = (request("order_sort")=="asc")?"asc":"desc";
+            $sort = (request("order_sort") == "asc") ? "asc" : "desc";
             /*
              * Check if order by contain "." it means {table}.{column} we have to parsing that
              */
-            if(strpos(request("order_by"), ".")!==false) {
-                $orderByTable = explode(".",request("order_by"))[0];
-                $orderByColumn = explode(".",request("order_by"))[1];
-                if(SchemaHelper::hasColumn($orderByTable, $orderByColumn)) {
+            if (strpos(request("order_by"), ".") !== false) {
+                $orderByTable = explode(".", request("order_by"))[0];
+                $orderByColumn = explode(".", request("order_by"))[1];
+                if (SchemaHelper::hasColumn($orderByTable, $orderByColumn)) {
                     $query->orderBy($orderByTable.".".$orderByColumn, $sort);
                 }
             } else {
                 /*
                  * Check if order_by column in registered columns
                  */
-                if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) {
+                if (in_array(request('order_by'), columnSingleton()->getColumnNameOnly())) {
                     $query->orderBy(request('order_by'), request('order_sort'));
                 }
             }
-        }else{
+        } else {
             /*
              * For default, query will be order by primary key as descending
              */

Braces +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
                     if(SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
                         $query->addSelect($this->data['table'].'.'.$column->getField());
                     }
-                }else{
+                } else{
                     $query->addSelect($column->getField());
                 }
             }
@@ -60,7 +60,7 @@ 
             $keyword = sanitizeXSS(request("q"));
             if(isset($this->data['hook_search_query'])) {
                 $query = call_user_func($this->data['hook_search_query'], $query);
-            }else{
+            } else{
                 $query->where(function ($where) use ($columns, $keyword) {
                     /**
                      * @var $where Builder
@@ -69,7 +69,7 @@ 
                     {
                         if(strpos($column->getField(),".") === false) {
                             $field = $this->data['table'].'.'.$column->getField();
-                        }else{
+                        } else{
                             $field = $column->getField();
                         }
                         $where->orWhere($field, 'like', '%'.$keyword.'%');
@@ -111,7 +111,7 @@ 
                     $query->orderBy(request('order_by'), request('order_sort'));
                 }
             }
-        }else{
+        } else{
             /*
              * For default, query will be order by primary key as descending
              */

src/controllers/scaffolding/traits/ColumnsRegister.php

Spacing +38 added lines, -38 removed lines

@@ -65,8 +65,8 @@ 
         $data = new TextModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("text");
 
@@ -82,8 +82,8 @@ 
         $data = new CheckboxModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("checkbox");
 
@@ -99,8 +99,8 @@ 
         $data = new PasswordModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("password");
         $data->setShowDetail(false);
@@ -118,8 +118,8 @@ 
         $data = new ImageModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("image");
 
@@ -135,8 +135,8 @@ 
         $data = new TextAreaModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("text_area");
 
@@ -147,20 +147,20 @@ 
 
     public function addSelectTable($label, $name = null, $selectConfig)
     {
-        if(isset($selectConfig['table']) && isset($selectConfig['value_option']) && isset($selectConfig['display_option'])) {
+        if (isset($selectConfig['table']) && isset($selectConfig['value_option']) && isset($selectConfig['display_option'])) {
             $this->index++;
 
             $data = new SelectTableModel();
             $data = $this->setDefaultModelValue($data);
             $data->setLabel($label);
-            $data->setName($this->name($label,$name));
+            $data->setName($this->name($label, $name));
             $data->setField($this->name($label, $name));
             $data->setType("select_table");
             $data->setOrderByColumn($selectConfig['table'].".".$selectConfig["display_option"]);
             columnSingleton()->setColumn($this->index, $data);
 
             $selectTable = new SelectTable($this->index);
-            $selectTable->optionsFromTable($selectConfig['table'],$selectConfig['value_option'],$selectConfig['display_option'],@$selectConfig['sql_condition']);
+            $selectTable->optionsFromTable($selectConfig['table'], $selectConfig['value_option'], $selectConfig['display_option'], @$selectConfig['sql_condition']);
 
             return $selectTable;
         } else {
@@ -175,7 +175,7 @@ 
         $data = new SelectOptionModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
+        $data->setName($this->name($label, $name));
         $data->setField($this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("select_option");
@@ -184,7 +184,7 @@ 
 
         $selectOption = new SelectOption($this->index);
 
-        if($options) {
+        if ($options) {
             $selectOption->options($options);
         }
 
@@ -204,16 +204,16 @@ 
         $data = new SelectQueryModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
+        $data->setName($this->name($label, $name));
         $data->setField($this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("select_query");
 
         columnSingleton()->setColumn($this->index, $data);
 
-        $selectQuery =new SelectQuery($this->index);
+        $selectQuery = new SelectQuery($this->index);
 
-        if($query) {
+        if ($query) {
             $selectQuery->optionsFromQuery($query);
         }
 
@@ -228,8 +228,8 @@ 
         $data = new CustomModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("custom");
 
@@ -245,8 +245,8 @@ 
         $data = new DateModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("date");
 
@@ -262,8 +262,8 @@ 
         $data = new DatetimeModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("datetime");
 
@@ -279,8 +279,8 @@ 
         $data = new EmailModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("email");
 
@@ -296,8 +296,8 @@ 
         $data = new FileModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("file");
 
@@ -314,8 +314,8 @@ 
         $data = new HiddenModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("hidden");
 
@@ -331,8 +331,8 @@ 
         $data = new NumberModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("number");
 
@@ -348,8 +348,8 @@ 
         $data = new MoneyModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("money");
 
@@ -365,8 +365,8 @@ 
         $data = new RadioModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("radio");
 
@@ -382,8 +382,8 @@ 
         $data = new WysiwygModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setOrderByColumn($data->getField());
         $data->setType("wysiwyg");