crocodic-studio / crudbooster

src/types/select_table/filter.blade.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
     /** @var \crocodicstudio\crudbooster\types\text\TextModel $column */
-    $filterName = "filter_".slug($column->getFilterColumn(),"_");
+    $filterName = "filter_".slug($column->getFilterColumn(), "_");
     $filterValue = sanitizeXSS(request($filterName));
 ?>
 <select name="filter_{{ slug($column->getFilterColumn(),"_") }}" style="width: 100%" id="filter_{{ $column->getName()  }}" class="form-control select2">

src/types/select_table/Hook.php

Spacing +5 added lines, -5 removed lines

@@ -19,8 +19,8 @@ 
      */
     public function query($query, $column)
     {
-        if($option = $column->getOptionsFromTable()) {
-            $query->leftjoin($option["table"],$option["table"].'.'.$option["primary_key"],"=", $column->getField());
+        if ($option = $column->getOptionsFromTable()) {
+            $query->leftjoin($option["table"], $option["table"].'.'.$option["primary_key"], "=", $column->getField());
             $query->addSelect($option['table'].'.'.$option['display_field'].' as '.$option['table'].'_'.$option['display_field']);
         }
         return $query;
@@ -32,13 +32,13 @@ 
      */
     public function indexRender($row, $column)
     {
-        if($column->getOptionsFromTable()) {
+        if ($column->getOptionsFromTable()) {
             $option = $column->getOptionsFromTable();
             return $row->{ $option['table'].'_'.$option['display_field'] };
-        }else{
+        } else {
             $option = $column->getOptions();
             $key = $row->{ $column->getField() };
-            return @$option[ $key ];
+            return @$option[$key];
         }
     }
 

src/types/text/Hook.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     public function indexRender($row, $column)
     {
         $value = trim(strip_tags($row->{ $column->getField() }));
-        if($column->getLimit()) {
+        if ($column->getLimit()) {
             $value = Str::limit($value, $column->getLimit());
         }
         return $value;
@@ -30,7 +30,7 @@ 
 
     public function filterQuery($query, $column, $value)
     {
-        $query->where($column->getFilterColumn(),"like","%".$value."%");
+        $query->where($column->getFilterColumn(), "like", "%".$value."%");
         return $query;
     }
 

src/types/text_area/Hook.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     public function indexRender($row, $column)
     {
         $value = trim(strip_tags($row->{ $column->getField() }));
-        if($column->getLimit()) {
+        if ($column->getLimit()) {
             $value = Str::limit($value, $column->getLimit());
         }
         return $value;
@@ -30,7 +30,7 @@ 
 
     public function filterQuery($query, $column, $value)
     {
-        $query->where($column->getFilterColumn(),"like","%".$value."%");
+        $query->where($column->getFilterColumn(), "like", "%".$value."%");
         return $query;
     }
 }
\ No newline at end of file

src/controllers/traits/Query.php

Spacing +28 added lines, -28 removed lines

@@ -25,13 +25,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'],
@@ -41,14 +41,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());
                 }
             }
@@ -57,27 +57,27 @@ 
             $query = getTypeHook($column->getType())->query($query, $column);
 
             // Filter Query From Type
-            $filterValue = request("filter_".slug($column->getFilterColumn(),"_"));
-            if(is_array($filterValue) || sanitizeXSS($filterValue)) {
+            $filterValue = request("filter_".slug($column->getFilterColumn(), "_"));
+            if (is_array($filterValue) || sanitizeXSS($filterValue)) {
                 $query = getTypeHook($column->getType())->filterQuery($query, $column, $filterValue);
             }
         }
 
-        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.'%');
@@ -90,36 +90,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
              */

src/controllers/scaffolding/traits/DefaultOption.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         $data = ColumnSingleton()->getColumn($this->index);
         $data->setFilterable($boolean);
         $data->setFilterHelp($help_info);
-        $data->setFilterPlaceholder($placeholder?:"Filter by ".$data->getLabel());
+        $data->setFilterPlaceholder($placeholder ?: "Filter by ".$data->getLabel());
         // Save back
         columnSingleton()->setColumn($this->index, $data);
 

src/controllers/scaffolding/traits/ColumnsRegister.php

Spacing +37 added lines, -37 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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("text");
@@ -83,8 +83,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("checkbox");
@@ -101,8 +101,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("password");
@@ -121,8 +121,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("image");
@@ -139,8 +139,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("text_area");
@@ -165,7 +165,7 @@ 
      */
     public function addSelectTable($label, $name = null, $selectConfig)
     {
-        if(isset($selectConfig['table']) &&
+        if (isset($selectConfig['table']) &&
             isset($selectConfig['value_option']) &&
             isset($selectConfig['display_option'])) {
             $this->index++;
@@ -173,7 +173,7 @@ 
             $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"]);
@@ -181,7 +181,7 @@ 
             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 {
@@ -196,7 +196,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
@@ -206,7 +206,7 @@ 
 
         $selectOption = new SelectOption($this->index);
 
-        if($options) {
+        if ($options) {
             $selectOption->options($options);
         }
 
@@ -221,8 +221,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("custom");
@@ -239,8 +239,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("date");
@@ -257,8 +257,8 @@ 
         $data = new TimeModel();
         $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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("time");
@@ -275,8 +275,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("datetime");
@@ -293,8 +293,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("email");
@@ -311,8 +311,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("file");
@@ -330,8 +330,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("hidden");
@@ -348,8 +348,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("number");
@@ -366,8 +366,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("money");
@@ -384,8 +384,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("radio");
@@ -402,8 +402,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($this->table().".".$data->getField());
         $data->setFilterColumn($this->table().".".$data->getField());
         $data->setType("wysiwyg");

src/controllers/scaffolding/singletons/ColumnSingleton.php

Spacing +24 added lines, -24 removed lines

@@ -42,17 +42,17 @@ 
     public function valueAssignment($data_row = null) {
         foreach ($this->getColumns() as $index=>$column) {
 
-            if (! $column->getName()) {
+            if (!$column->getName()) {
                 continue;
             }
 
             /** @var ColumnModel $column */
-            if($data_row) {
-                $value = (isset($data_row->{$column->getField()}))?$data_row->{ $column->getField() }:null;
-            }else{
+            if ($data_row) {
+                $value = (isset($data_row->{$column->getField()})) ? $data_row->{ $column->getField() }:null;
+            } else {
                 $value = request($column->getName());
 
-                if(!$value && $column->getDefaultValue()) {
+                if (!$value && $column->getDefaultValue()) {
                     $value = $column->getDefaultValue();
                 }
 
@@ -68,9 +68,9 @@ 
     {
         $data = $this->columns;
         $newData = [];
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowIndex()) {
+            if ($item->getShowIndex()) {
                 $newData[] = $item;
             }
         }
@@ -81,9 +81,9 @@ 
     {
         $data = $this->columns;
         $newData = [];
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowAdd() || $item->getShowEdit()) {
+            if ($item->getShowAdd() || $item->getShowEdit()) {
                 $newData[] = $item;
             }
         }
@@ -94,9 +94,9 @@ 
     {
         $data = $this->columns;
         $newData = [];
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowEdit()) {
+            if ($item->getShowEdit()) {
                 $newData[] = $item;
             }
         }
@@ -107,9 +107,9 @@ 
     {
         $data = $this->columns;
         $newData = [];
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowAdd()) {
+            if ($item->getShowAdd()) {
                 $newData[] = $item;
             }
         }
@@ -120,9 +120,9 @@ 
     {
         $data = $this->columns;
         $newData = [];
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getFilterable()) {
+            if ($item->getFilterable()) {
                 $newData[] = $item;
             }
         }
@@ -133,9 +133,9 @@ 
     {
         $data = $this->columns;
         $newData = [];
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowDetail()) {
+            if ($item->getShowDetail()) {
                 $newData[] = $item;
             }
         }
@@ -145,14 +145,14 @@ 
     public function getAssignmentData()
     {
         $data = [];
-        foreach($this->columns as $column) {
+        foreach ($this->columns as $column) {
             /** @var ColumnModel $column */
 
-            if(is_array($column->getValue())) {
-                foreach($column->getValue() as $key=>$val) {
+            if (is_array($column->getValue())) {
+                foreach ($column->getValue() as $key=>$val) {
                     $data[$key] = $val;
                 }
-            }else{
+            } else {
                 $data[$column->getField()] = $column->getValue();
             }
         }
@@ -162,10 +162,10 @@ 
     public function removeColumn($label_or_name)
     {
         $data = $this->getColumns();
-        foreach($data as $i=>$d)
+        foreach ($data as $i=>$d)
         {
             /** @var ColumnModel $d */
-            if($d->getLabel() == $label_or_name || $d->getName() == $label_or_name) {
+            if ($d->getLabel() == $label_or_name || $d->getName() == $label_or_name) {
                 unset($data[$i]);
             }
         }
@@ -175,7 +175,7 @@ 
     public function getColumnNameOnly()
     {
         $result = [];
-        foreach($this->columns as $column) {
+        foreach ($this->columns as $column) {
             /** @var ColumnModel $column */
             $result[] = $column->getName();
         }