crocodic-studio / crudbooster

src/types/select_table/Hook.php

Spacing +5 added lines, -5 removed lines

@@ -19,9 +19,9 @@ 
      */
     public function query($query, $column)
     {
-        if($column->getOptionsFromTable()) {
+        if ($column->getOptionsFromTable()) {
             $option = $column->getOptionsFromTable();
-            $query->leftjoin($option["table"],$option["table"].'.'.$option["key_field"],"=", $column->getName());
+            $query->leftjoin($option["table"], $option["table"].'.'.$option["key_field"], "=", $column->getName());
             $query->addSelect($option['table'].'.'.$option['display_field'].' as '.$option['table'].'_'.$option['display_field']);
         }
         return $query;
@@ -33,13 +33,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];
         }
     }
 

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         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 ];

src/types/select_table/SelectTableController.php

Spacing +3 added lines, -3 removed lines

@@ -18,11 +18,11 @@ 
         $foreignValue = request('foreign_value');
         $table = decrypt(request('table'));
         $sqlCondition = decrypt(request('sql_condition'));
-        if($foreignKey && $foreignValue && $table) {
+        if ($foreignKey && $foreignValue && $table) {
 
             $data = DB::table($table)
                 ->where($foreignKey, $foreignValue);
-            if($sqlCondition) {
+            if ($sqlCondition) {
                 $data->whereRaw($sqlCondition);
             }
 
@@ -30,7 +30,7 @@ 
 
             return response()->json(['status'=>true, 'data'=>$data], 200, ["X-Frame-Options"=>"SAMEORIGIN"]);
 
-        }else{
+        } else {
             return response()->json(['status'=>false]);
         }
     }

Braces +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
             return response()->json(['status'=>true, 'data'=>$data], 200, ["X-Frame-Options"=>"SAMEORIGIN"]);
 
-        }else{
+        } else{
             return response()->json(['status'=>false]);
         }
     }

src/types/select_query/component.blade.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
             name="{{ $column->getName() }}" id="{{ $column->getName() }}">
         <option value="">** Select a {{ $column->getLabel() }}</option>
         <?php
-            $columnValue = old($column->getName())?:($column->getDefaultValue())?:$column->getValue();
+            $columnValue = old($column->getName()) ?: ($column->getDefaultValue()) ?: $column->getValue();
         ?>
         @foreach($column->getOptions() as $key=>$value)
             <option {{ $columnValue==$key?'selected':'' }} value="{{ $key }}">{{ $value }}</option>

src/types/select_query/SelectQuery.php

Spacing +5 added lines, -5 removed lines

@@ -29,16 +29,16 @@
 
         columnSingleton()->setColumn($this->index, $data);
 
-        if(is_callable($query)) {
+        if (is_callable($query)) {
             $result = call_user_func($query);
-        }else{
+        } else {
             $result = DB::select(DB::raw($query));
         }
 
-        if($result) {
+        if ($result) {
             $options = [];
-            foreach($result as $r) {
-                $options[ $r->key ] = $r->label;
+            foreach ($result as $r) {
+                $options[$r->key] = $r->label;
             }
             $this->options($options);
         }

Braces +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 
         if(is_callable($query)) {
             $result = call_user_func($query);
-        }else{
+        } else{
             $result = DB::select(DB::raw($query));
         }
 

src/types/select_query/Hook.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     {
         $option = $column->getOptions();
         $key = $row->{ $column->getField() };
-        return @$option[ $key ];
+        return @$option[$key];
     }
 
     public function detailRender($row, $column)

src/controllers/DeveloperModulesController.php

Braces +11 added lines, -9 removed lines

@@ -54,7 +54,7 @@ 
 
             if(Str::contains(strtolower($item),["title","name","label"])) {
                 $display = true;
-            }else{
+            } else{
                 $display = false;
             }
 
@@ -83,7 +83,9 @@ 
             if($column != $pk) {
 
                 // Skip Column
-                if($column == 'deleted_at') continue;
+                if($column == 'deleted_at') {
+                    continue;
+                }
 
                 // Check if any relation table candidate
                 $optionTable = "";
@@ -92,7 +94,7 @@ 
                     if(Schema::hasTable($relationTable)) {
                         $optionTable = $relationTable;
                     }
-                }elseif (Str::substr(strtolower($column),0,3) == "id_") {
+                } elseif (Str::substr(strtolower($column),0,3) == "id_") {
                     $relationTable = Str::substr($column,3);
                     if(Schema::hasTable($relationTable)) {
                         $optionTable = $relationTable;
@@ -105,15 +107,15 @@ 
 
                 if(Str::contains(strtolower($label),["photo","image","picture","gambar"])) {
                     $type = "image";
-                }elseif (Str::contains(strtolower($label),["email","mail"])) {
+                } elseif (Str::contains(strtolower($label),["email","mail"])) {
                     $type = "email";
-                }elseif (Str::contains(strtolower($label),["description","content","detail"])) {
+                } elseif (Str::contains(strtolower($label),["description","content","detail"])) {
                     $type =  "wysiwyg";
-                }elseif (Str::contains(strtolower($label),["price","money","grand_total","tax"])) {
+                } elseif (Str::contains(strtolower($label),["price","money","grand_total","tax"])) {
                     $type = "money";
-                }elseif (Str::contains(strtolower($label),["quantity","qty","total","phone","telp"])) {
+                } elseif (Str::contains(strtolower($label),["quantity","qty","total","phone","telp"])) {
                     $type = "number";
-                }elseif (Str::contains(strtolower($label),["date"])) {
+                } elseif (Str::contains(strtolower($label),["date"])) {
                     $type = "date";
                 }
 
@@ -219,7 +221,7 @@ 
 
                     if($item['length']) {
                         $structureItems .= "\$table->".$item['type_data']."('".$item['field_name']."', ".$item['length'].")$nullable;\n\t\t\t";
-                    }else{
+                    } else{
                         $structureItems .= "\$table->".$item['type_data']."('".$item['field_name']."')$nullable;\n\t\t\t";
                     }
                 }

Spacing +49 added lines, -49 removed lines

@@ -31,13 +31,13 @@ 
     public function getIndex() {
         $data = [];
         $data['result'] = DB::table("cb_modules")->get();
-        return view($this->view.'.index',$data);
+        return view($this->view.'.index', $data);
     }
 
     public function getAdd() {
         $data = [];
         $data['tables'] = cb()->listAllTable();
-        $data['module'] = (request('modules_id'))?cb()->find("cb_modules", request("modules_id")):null;
+        $data['module'] = (request('modules_id')) ?cb()->find("cb_modules", request("modules_id")) : null;
         return view($this->view.'.add', $data);
     }
 
@@ -50,17 +50,17 @@ 
         $data = cb()->listAllColumns($table);
         $pk = cb()->findPrimaryKey($table);
         $result = [];
-        foreach($data as $item) {
+        foreach ($data as $item) {
 
-            if(Str::contains(strtolower($item),["title","name","label"])) {
+            if (Str::contains(strtolower($item), ["title", "name", "label"])) {
                 $display = true;
-            }else{
+            } else {
                 $display = false;
             }
 
             $result[] = [
                 "column"=>$item,
-                "primary_key"=>($pk==$item)?true:false,
+                "primary_key"=>($pk == $item) ?true:false,
                 "display"=>$display
             ];
         }
@@ -69,9 +69,9 @@ 
 
     public function getColumns($table)
     {
-        if(request("modules_id")) {
-            $module = cb()->find("cb_modules",request("modules_id"));
-            if($module->last_column_build) {
+        if (request("modules_id")) {
+            $module = cb()->find("cb_modules", request("modules_id"));
+            if ($module->last_column_build) {
                 return response()->json(json_decode($module->last_column_build));
             }
         }
@@ -79,56 +79,56 @@ 
         $columns = cb()->listAllColumns($table);
         $pk = cb()->findPrimaryKey($table);
         $result = [];
-        foreach($columns as $column) {
-            if($column != $pk) {
+        foreach ($columns as $column) {
+            if ($column != $pk) {
 
                 // Skip Column
-                if($column == 'deleted_at') continue;
+                if ($column == 'deleted_at') continue;
 
                 // Check if any relation table candidate
                 $optionTable = "";
-                if(Str::substr(strtolower($column),-3,3) == "_id") {
-                    $relationTable = Str::substr($column,0,-3);
-                    if(Schema::hasTable($relationTable)) {
+                if (Str::substr(strtolower($column), -3, 3) == "_id") {
+                    $relationTable = Str::substr($column, 0, -3);
+                    if (Schema::hasTable($relationTable)) {
                         $optionTable = $relationTable;
                     }
-                }elseif (Str::substr(strtolower($column),0,3) == "id_") {
-                    $relationTable = Str::substr($column,3);
-                    if(Schema::hasTable($relationTable)) {
+                }elseif (Str::substr(strtolower($column), 0, 3) == "id_") {
+                    $relationTable = Str::substr($column, 3);
+                    if (Schema::hasTable($relationTable)) {
                         $optionTable = $relationTable;
                     }
                 }
 
-                $label = trim(Str::title(str_replace(["id_","_id","_"]," ",$column)));
+                $label = trim(Str::title(str_replace(["id_", "_id", "_"], " ", $column)));
                 $label = Str::singular($label);
                 $type = "text";
 
-                if(Str::contains(strtolower($label),["photo","image","picture","gambar"])) {
+                if (Str::contains(strtolower($label), ["photo", "image", "picture", "gambar"])) {
                     $type = "image";
-                }elseif (Str::contains(strtolower($label),["email","mail"])) {
+                }elseif (Str::contains(strtolower($label), ["email", "mail"])) {
                     $type = "email";
-                }elseif (Str::contains(strtolower($label),["description","content","detail"])) {
-                    $type =  "wysiwyg";
-                }elseif (Str::contains(strtolower($label),["price","money","grand_total","tax"])) {
+                }elseif (Str::contains(strtolower($label), ["description", "content", "detail"])) {
+                    $type = "wysiwyg";
+                }elseif (Str::contains(strtolower($label), ["price", "money", "grand_total", "tax"])) {
                     $type = "money";
-                }elseif (Str::contains(strtolower($label),["quantity","qty","total","phone","telp"])) {
+                }elseif (Str::contains(strtolower($label), ["quantity", "qty", "total", "phone", "telp"])) {
                     $type = "number";
-                }elseif (Str::contains(strtolower($label),["date"])) {
+                }elseif (Str::contains(strtolower($label), ["date"])) {
                     $type = "date";
                 }
 
-                if (Str::substr(strtolower($column),-3,3) == "_id") {
+                if (Str::substr(strtolower($column), -3, 3) == "_id") {
                     $type = "select_table";
                 } elseif (Str::substr($column, -3, 3) == "_at") {
                     $type = "datetime";
-                } elseif (Str::substr($column,0, 3) == "id_") {
+                } elseif (Str::substr($column, 0, 3) == "id_") {
                     $type = "select_table";
                 }
 
                 $columnAdd = "on";
                 $columnEdit = "on";
                 $columnMandatory = "on";
-                if(in_array($column,['created_at','updated_at'])) {
+                if (in_array($column, ['created_at', 'updated_at'])) {
                     $columnAdd = "";
                     $columnEdit = "";
                     $columnMandatory = "";
@@ -187,39 +187,39 @@ 
     public function postCreateMigration()
     {
         try {
-            cb()->validation(['table_name','structures']);
+            cb()->validation(['table_name', 'structures']);
 
             $tableName = request("table_name");
 
-            if(!Schema::hasTable($tableName)) {
+            if (!Schema::hasTable($tableName)) {
                 $filenameMigration = date("Y_m_d_His")."_".$tableName.".php";
                 $createTemplate = file_get_contents(base_path("vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/create.stub"));
                 $className = Str::studly($tableName);
                 $createTemplate = str_replace("DummyClass", $className, $createTemplate);
                 $createTemplate = str_replace("DummyTable", $tableName, $createTemplate);
-                $createTemplate = str_replace("\$table->increments('id');","",$createTemplate);
+                $createTemplate = str_replace("\$table->increments('id');", "", $createTemplate);
 
                 $structureItems = "";
 
-                if(request("timestamp")) {
+                if (request("timestamp")) {
                     $structureItems .= "\$table->timestamps();\n\t\t\t";
                 }
 
-                if(request("soft_deletes")) {
+                if (request("soft_deletes")) {
                     $structureItems .= "\$table->softDeletes();\n\t\t\t";
                 }
 
-                foreach(request("structures") as $item) {
+                foreach (request("structures") as $item) {
 
                     $nullable = "";
 
-                    if(!in_array($item['type_data'],["bigIncrements","increments","mediumIncrements","smallIncrements"])) {
+                    if (!in_array($item['type_data'], ["bigIncrements", "increments", "mediumIncrements", "smallIncrements"])) {
                         $nullable = "->nullable()";
                     }
 
-                    if($item['length']) {
+                    if ($item['length']) {
                         $structureItems .= "\$table->".$item['type_data']."('".$item['field_name']."', ".$item['length'].")$nullable;\n\t\t\t";
-                    }else{
+                    } else {
                         $structureItems .= "\$table->".$item['type_data']."('".$item['field_name']."')$nullable;\n\t\t\t";
                     }
                 }
@@ -238,12 +238,12 @@ 
             }
 
         } catch (CBValidationException $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         } catch (\Exception $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         }
 
-        return response()->json(['status'=>true,'message'=>'Migration successfully!']);
+        return response()->json(['status'=>true, 'message'=>'Migration successfully!']);
     }
 
     public function postCheckExistModule()
@@ -251,12 +251,12 @@ 
         try {
             cb()->validation(['name', 'table']);
 
-            if(DB::table("cb_modules")->where("table_name",request("table"))->where("name",request("name"))->count()) {
+            if (DB::table("cb_modules")->where("table_name", request("table"))->where("name", request("name"))->count()) {
                 return response()->json(['status'=>true]);
             }
 
         } catch (CBValidationException $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         }
 
         return response()->json(['status'=>false]);
@@ -265,30 +265,30 @@ 
     public function postAddSave() {
 
         try {
-            cb()->validation(['name', 'table','icon','columns']);
+            cb()->validation(['name', 'table', 'icon', 'columns']);
 
             $module = (new ModuleGenerator(request('table'), request('name'), request('icon'), request("columns"), request("rebuild")))->make();
 
         } catch (CBValidationException $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         }
 
         return response()->json(['status'=>true, 'message'=>'Please remember that you can still modify the structure by edit the controller file '.$module['controller'].' :)']);
     }
 
     public function getDelete($id) {
-        $module = cb()->find("cb_modules",$id);
+        $module = cb()->find("cb_modules", $id);
         @unlink(app_path("Http/Controllers/".$module->controller.".php"));
         DB::table("cb_modules")->where("id", $id)->delete();
         DB::table("cb_menus")->where("cb_modules_id", $id)->delete();
-        return cb()->redirectBack("The module has been deleted!","success");
+        return cb()->redirectBack("The module has been deleted!", "success");
     }
 
     public function getDeleteSoft($id) {
-        $module = cb()->find("cb_modules",$id);
+        $module = cb()->find("cb_modules", $id);
         DB::table("cb_modules")->where("id", $id)->delete();
         DB::table("cb_menus")->where("cb_modules_id", $id)->delete();
-        return cb()->redirectBack("The module has been deleted!","success");
+        return cb()->redirectBack("The module has been deleted!", "success");
     }
 
 }
\ No newline at end of file

src/helpers/ModuleGenerator.php

Spacing +38 added lines, -38 removed lines

@@ -37,15 +37,15 @@ 
     }
 
     public function make() {
-        $name = trim(($this->name)?:ucwords(str_replace("_"," ",$this->table)));
+        $name = trim(($this->name) ?: ucwords(str_replace("_", " ", $this->table)));
 
         $template = file_get_contents(__DIR__."/../templates/FooBarController.stub");
 
         //Replace table
-        $template = str_replace("{table}",'"'.$this->table.'"', $template);
+        $template = str_replace("{table}", '"'.$this->table.'"', $template);
 
         //Replace permalink
-        $permalink = strtolower(Str::slug($name,"_"));
+        $permalink = strtolower(Str::slug($name, "_"));
         $template = str_replace("{permalink}", '"'.$permalink.'"', $template);
 
         //Replace Page title
@@ -53,20 +53,20 @@ 
 
         //Replace scaffolding
         $scaffold = "";
-        foreach($this->columns as $field) {
+        foreach ($this->columns as $field) {
             $label = $field['column_label'];
             $column = $field['column_field'];
-            $help = isset($field['column_help'])?"->help(\"".$field['column_help']."\")":"";
-            $required = ($field['column_mandatory']=="on")?"":"->required(false)";
-            $indexShow = ($field['column_browse']=="on")?"":"->showIndex(false)";
-            $detailShow = ($field['column_detail']=="on")?"":"->showDetail(false)";
-            $editShow = ($field['column_edit']=="on")?"":"->showEdit(false)";
-            $addShow = ($field['column_add']=="on")?"":"->showAdd(false)";
+            $help = isset($field['column_help']) ? "->help(\"".$field['column_help']."\")" : "";
+            $required = ($field['column_mandatory'] == "on") ? "" : "->required(false)";
+            $indexShow = ($field['column_browse'] == "on") ? "" : "->showIndex(false)";
+            $detailShow = ($field['column_detail'] == "on") ? "" : "->showDetail(false)";
+            $editShow = ($field['column_edit'] == "on") ? "" : "->showEdit(false)";
+            $addShow = ($field['column_add'] == "on") ? "" : "->showAdd(false)";
             $optionTable = $field['column_option_table'];
             $optionValue = $field['column_option_value'];
             $optionDisplay = $field['column_option_display'];
             $optionSqlCondition = $field['column_option_sql_condition'];
-            $optionSqlCondition = str_replace('"',"'", $optionSqlCondition);
+            $optionSqlCondition = str_replace('"', "'", $optionSqlCondition);
             $sqlRawQuery = $field['column_sql_query'];
             $options = $field['column_options'];
             $imageResizeWidth = $field['column_image_width'];
@@ -82,45 +82,45 @@ 
             $moneyDecimalSeparator = $field['column_money_decimal_separator'];
 
             // Additional Attributes
-            $additional = $required . $indexShow . $detailShow . $addShow . $editShow . $help ;
+            $additional = $required.$indexShow.$detailShow.$addShow.$editShow.$help;
 
             // Additional money
-            $additional .= ($moneyPrefix && $field['column_type']=='money')?"->prefix('".$moneyPrefix."')":"";
-            $additional .= ($moneyPrecision && $field['column_type']=='money')?"->precision('".$moneyPrecision."')":"";
-            $additional .= ($moneyThousandSeparator && $field['column_type']=='money')?"->thousandSeparator('".$moneyThousandSeparator."')":"";
-            $additional .= ($moneyDecimalSeparator && $field['column_type']=='money')?"->decimalSeparator('".$moneyDecimalSeparator."')":"";
+            $additional .= ($moneyPrefix && $field['column_type'] == 'money') ? "->prefix('".$moneyPrefix."')" : "";
+            $additional .= ($moneyPrecision && $field['column_type'] == 'money') ? "->precision('".$moneyPrecision."')" : "";
+            $additional .= ($moneyThousandSeparator && $field['column_type'] == 'money') ? "->thousandSeparator('".$moneyThousandSeparator."')" : "";
+            $additional .= ($moneyDecimalSeparator && $field['column_type'] == 'money') ? "->decimalSeparator('".$moneyDecimalSeparator."')" : "";
 
             // Additional for image & file type
-            $additional .= ($fileEncrypt && in_array($field['column_type'],['file','image']))?"->encrypt(true)":"";
-            $additional .= ($imageResizeWidth && in_array($field['column_type'],['file','image']))?"->resize(".$imageResizeWidth.",".$imageResizeHeight.")":"";
+            $additional .= ($fileEncrypt && in_array($field['column_type'], ['file', 'image'])) ? "->encrypt(true)" : "";
+            $additional .= ($imageResizeWidth && in_array($field['column_type'], ['file', 'image'])) ? "->resize(".$imageResizeWidth.",".$imageResizeHeight.")" : "";
 
             // Additional for date & datetime
-            $additional .= ($dateFormat && in_array($field['column_type'],['date','datetime']))?"->format('".$dateFormat."')":"";
+            $additional .= ($dateFormat && in_array($field['column_type'], ['date', 'datetime'])) ? "->format('".$dateFormat."')" : "";
 
             // Additional for text
-            $additional .= ($textDisplayLimit!="" && in_array($field['column_type'],['text','text_area','wysiwyg']))?"->strLimit(".$textDisplayLimit.")":"";
-            $additional .= ($maxCharacter!="" && in_array($field['column_type'],['text','text_area']))?"->maxLength(".$maxCharacter.")":"";
-            $additional .= ($minCharacter!="" && in_array($field['column_type'],['text','text_area']))?"->minLength(".$minCharacter.")":"";
+            $additional .= ($textDisplayLimit != "" && in_array($field['column_type'], ['text', 'text_area', 'wysiwyg'])) ? "->strLimit(".$textDisplayLimit.")" : "";
+            $additional .= ($maxCharacter != "" && in_array($field['column_type'], ['text', 'text_area'])) ? "->maxLength(".$maxCharacter.")" : "";
+            $additional .= ($minCharacter != "" && in_array($field['column_type'], ['text', 'text_area'])) ? "->minLength(".$minCharacter.")" : "";
 
             $methodName = Str::studly($field['column_type']);
-            if($label && $column) {
-                if(in_array($field['column_type'],['radio','select_option','checkbox'])) {
-                    if($options) {
+            if ($label && $column) {
+                if (in_array($field['column_type'], ['radio', 'select_option', 'checkbox'])) {
+                    if ($options) {
                         $optResult = [];
-                        foreach($options as $opt) {
+                        foreach ($options as $opt) {
                             $optResult[$opt['key']] = $opt['label'];
                         }
-                        $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '")->options('.min_var_export($optResult).')' . $additional . ';' . "\n\t\t";
+                        $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")->options('.min_var_export($optResult).')'.$additional.';'."\n\t\t";
                     }
-                }elseif (in_array($field['column_type'],['radio_table','select_table'])) {
+                }elseif (in_array($field['column_type'], ['radio_table', 'select_table'])) {
                     if ($optionTable && $optionValue && $optionDisplay) {
-                        $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '",["table"=>"' . $optionTable . '","value_option"=>"' . $optionValue . '","display_option"=>"' . $optionDisplay . '","sql_condition"=>"' . $optionSqlCondition . '"])' . $additional . ';' . "\n\t\t";
+                        $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'",["table"=>"'.$optionTable.'","value_option"=>"'.$optionValue.'","display_option"=>"'.$optionDisplay.'","sql_condition"=>"'.$optionSqlCondition.'"])'.$additional.';'."\n\t\t";
                     }
                 }elseif ($field['column_type'] == "select_query") {
-                    if($sqlRawQuery && Str::contains($sqlRawQuery,["as `key`","as `label`"])) {
-                        $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '","'.$sqlRawQuery.'")' . $additional . ';' . "\n\t\t";
+                    if ($sqlRawQuery && Str::contains($sqlRawQuery, ["as `key`", "as `label`"])) {
+                        $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'","'.$sqlRawQuery.'")'.$additional.';'."\n\t\t";
                     }
-                }else{
+                } else {
                     $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")'.$additional.';'."\n\t\t";
                 }
             }
@@ -143,10 +143,10 @@ 
         $module['controller'] = $filename;
         $module['last_column_build'] = json_encode($this->columns);
 
-        if($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name",$this->table)->first()) {
-            DB::table("cb_modules")->where("id",$moduleData->id)->update($module);
+        if ($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name", $this->table)->first()) {
+            DB::table("cb_modules")->where("id", $moduleData->id)->update($module);
             $id_modules = $moduleData->id;
-        }else{
+        } else {
             $id_modules = DB::table('cb_modules')->insertGetId($module);
         }
 
@@ -155,9 +155,9 @@ 
         $menu['name'] = $module['name'];
         $menu['type'] = 'module';
         $menu['cb_modules_id'] = $id_modules;
-        if(isset($moduleData)) {
-            DB::table("cb_menus")->where("cb_modules_id",$moduleData->id)->update($menu);
-        }else{
+        if (isset($moduleData)) {
+            DB::table("cb_menus")->where("cb_modules_id", $moduleData->id)->update($menu);
+        } else {
             DB::table('cb_menus')->insertGetId($menu);
         }
 

Braces +5 added lines, -5 removed lines

@@ -112,15 +112,15 @@ 
                         }
                         $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '")->options('.min_var_export($optResult).')' . $additional . ';' . "\n\t\t";
                     }
-                }elseif (in_array($field['column_type'],['radio_table','select_table'])) {
+                } elseif (in_array($field['column_type'],['radio_table','select_table'])) {
                     if ($optionTable && $optionValue && $optionDisplay) {
                         $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '",["table"=>"' . $optionTable . '","value_option"=>"' . $optionValue . '","display_option"=>"' . $optionDisplay . '","sql_condition"=>"' . $optionSqlCondition . '"])' . $additional . ';' . "\n\t\t";
                     }
-                }elseif ($field['column_type'] == "select_query") {
+                } elseif ($field['column_type'] == "select_query") {
                     if($sqlRawQuery && Str::contains($sqlRawQuery,["as `key`","as `label`"])) {
                         $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '","'.$sqlRawQuery.'")' . $additional . ';' . "\n\t\t";
                     }
-                }else{
+                } else{
                     $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")'.$additional.';'."\n\t\t";
                 }
             }
@@ -146,7 +146,7 @@ 
         if($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name",$this->table)->first()) {
             DB::table("cb_modules")->where("id",$moduleData->id)->update($module);
             $id_modules = $moduleData->id;
-        }else{
+        } else{
             $id_modules = DB::table('cb_modules')->insertGetId($module);
         }
 
@@ -157,7 +157,7 @@ 
         $menu['cb_modules_id'] = $id_modules;
         if(isset($moduleData)) {
             DB::table("cb_menus")->where("cb_modules_id",$moduleData->id)->update($menu);
-        }else{
+        } else{
             DB::table('cb_menus')->insertGetId($menu);
         }
 

src/middlewares/CBDeveloper.php

Spacing +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
     public function handle($request, Closure $next)
     {
 
-        if(session()->get("developer") != getSetting('developer_username')) {
-            return cb()->redirect(cb()->getDeveloperUrl("login"),"Please login for first");
+        if (session()->get("developer") != getSetting('developer_username')) {
+            return cb()->redirect(cb()->getDeveloperUrl("login"), "Please login for first");
         }
 
         return $next($request);

src/commands/DeveloperCommandService.php

Spacing +4 added lines, -4 removed lines

@@ -25,15 +25,15 @@
     {
 
         try {
-            if(@$this->command->option("password") == "AUTO" || !@$this->command->option("password")) {
+            if (@$this->command->option("password") == "AUTO" || !@$this->command->option("password")) {
                 $password = Str::random(16);
-            }else{
+            } else {
                 $password = $this->command->option("password");
             }
 
-            if(@$this->command->option("username") == "AUTO" || !@$this->command->option("username")) {
+            if (@$this->command->option("username") == "AUTO" || !@$this->command->option("username")) {
                 $username = Str::random(5);
-            }else{
+            } else {
                 $username = $this->command->option("username");
             }
         } catch (\Exception $e) {

Braces +2 added lines, -2 removed lines

@@ -27,13 +27,13 @@
         try {
             if(@$this->command->option("password") == "AUTO" || !@$this->command->option("password")) {
                 $password = Str::random(16);
-            }else{
+            } else{
                 $password = $this->command->option("password");
             }
 
             if(@$this->command->option("username") == "AUTO" || !@$this->command->option("username")) {
                 $username = Str::random(5);
-            }else{
+            } else{
                 $username = $this->command->option("username");
             }
         } catch (\Exception $e) {