crocodic-studio / crudbooster

src/types/select_table/SelectTable.php

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function optionsFromTable($table, $value_option, $display_option, $SQLCondition = null) {
 
-        if(strpos($table,"App\Models")!==false) {
+        if (strpos($table, "App\Models") !== false) {
             $table = new $table();
             $table = $table::$tableName;
         }
@@ -50,11 +50,11 @@ 
 
         $options = [];
         foreach ($data as $d) {
-            $options[ $d->$value_option ] = $d->$display_option;
+            $options[$d->$value_option] = $d->$display_option;
         }
         $data = columnSingleton()->getColumn($this->index);
         /** @var $data SelectTableModel */
-        $data->setOptionsFromTable(["table"=>$table,"key_field"=>$value_option,"display_field"=>$display_option,"sql_condition"=>$SQLCondition]);
+        $data->setOptionsFromTable(["table"=>$table, "key_field"=>$value_option, "display_field"=>$display_option, "sql_condition"=>$SQLCondition]);
         columnSingleton()->setColumn($this->index, $data);
 
         $this->options($options);

src/controllers/SubModuleController.php

Spacing +5 added lines, -5 removed lines

@@ -14,16 +14,16 @@ 
 {
 
     public function getSubModule($subModuleKey) {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
-        if(!verifyReferalUrl()) return cb()->redirect(module()->url(),"It looks like your url is incorrect");
+        if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
+        if (!verifyReferalUrl()) return cb()->redirect(module()->url(), "It looks like your url is incorrect");
 
-        if($subModule = Cache::get("subModule".$subModuleKey)) {
+        if ($subModule = Cache::get("subModule".$subModuleKey)) {
             $foreignKey = $subModule['foreignKey'];
             $foreignValue = $subModule['foreignValue'];
 
             $query = $this->repository();
             $query->where($foreignKey, $foreignValue);
-            $result = $query->paginate( request("limit")?:cbConfig("LIMIT_TABLE_DATA") );
+            $result = $query->paginate(request("limit") ?: cbConfig("LIMIT_TABLE_DATA"));
             $data['result'] = $result;
 
             $data['additionalHeaderTitle'] = $subModule['parentTitle'];
@@ -33,7 +33,7 @@ 
             return view("crudbooster::module.index.index", array_merge($data, $this->data));
         }
 
-        return cb()->redirect(module()->url(),"It looks like your url is incorrect");
+        return cb()->redirect(module()->url(), "It looks like your url is incorrect");
     }
 
 }
\ No newline at end of file

Braces +6 added lines, -2 removed lines

@@ -14,8 +14,12 @@
 {
 
     public function getSubModule($subModuleKey) {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
-        if(!verifyReferalUrl()) return cb()->redirect(module()->url(),"It looks like your url is incorrect");
+        if(!module()->canBrowse()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
+        if(!verifyReferalUrl()) {
+            return cb()->redirect(module()->url(),"It looks like your url is incorrect");
+        }
 
         if($subModule = Cache::get("subModule".$subModuleKey)) {
             $foreignKey = $subModule['foreignKey'];

src/controllers/CBController.php

Spacing +37 added lines, -37 removed lines

@@ -32,10 +32,10 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         $query = $this->repository();
-        $result = $query->paginate( request("limit")?:cbConfig("LIMIT_TABLE_DATA") );
+        $result = $query->paginate(request("limit") ?: cbConfig("LIMIT_TABLE_DATA"));
         $data['result'] = $result;
 
         return view("crudbooster::module.index.index", array_merge($data, $this->data));
@@ -43,17 +43,17 @@ 
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : '.cbLang('add');
         $data['action_url'] = module()->addSaveURL();
-        return view('crudbooster::module.form.form',array_merge($data, $this->data));
+        return view('crudbooster::module.form.form', array_merge($data, $this->data));
     }
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         try {
             $this->validation();
@@ -61,38 +61,38 @@ 
             $data = columnSingleton()->getAssignmentData();
 
             //Clear data from Primary Key
-            unset($data[ cb()->pk($this->data['table']) ]);
+            unset($data[cb()->pk($this->data['table'])]);
 
-            if(Schema::hasColumn($this->data['table'], 'created_at')) {
+            if (Schema::hasColumn($this->data['table'], 'created_at')) {
                 $data['created_at'] = date('Y-m-d H:i:s');
             }
 
-            if(Schema::hasColumn($this->data['table'], 'updated_at')) {
+            if (Schema::hasColumn($this->data['table'], 'updated_at')) {
                 $data['updated_at'] = date('Y-m-d H:i:s');
             }
 
-            if(isset($this->data['hook_before_insert']) && is_callable($this->data['hook_before_insert'])) {
+            if (isset($this->data['hook_before_insert']) && is_callable($this->data['hook_before_insert'])) {
                 $data = call_user_func($this->data['hook_before_insert'], $data);
             }
 
             $id = DB::table($this->data['table'])->insertGetId($data);
 
-            if(isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) {
+            if (isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) {
                 call_user_func($this->data['hook_after_insert'], $id);
             }
 
         } catch (CBValidationException $e) {
             Log::debug($e);
-            return cb()->redirectBack($e->getMessage(),'info');
+            return cb()->redirectBack($e->getMessage(), 'info');
         } catch (\Exception $e) {
             Log::error($e);
-            return cb()->redirectBack(cbLang("something_went_wrong"),'warning');
+            return cb()->redirectBack(cbLang("something_went_wrong"), 'warning');
         }
 
-        if (Str::contains(request("submit"),cbLang("more"))) {
+        if (Str::contains(request("submit"), cbLang("more"))) {
             return cb()->redirectBack(cbLang("the_data_has_been_added"), 'success');
         } else {
-            if(verifyReferalUrl()) {
+            if (verifyReferalUrl()) {
                 return cb()->redirect(getReferalUrl("url"), cbLang("the_data_has_been_added"), 'success');
             } else {
                 return cb()->redirect(module()->url(), cbLang("the_data_has_been_added"), 'success');
@@ -102,7 +102,7 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -113,7 +113,7 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         try {
             $this->validation();
@@ -121,40 +121,40 @@ 
             $data = columnSingleton()->getAssignmentData();
 
             // Make sure the Primary Key is not included
-            unset($data[ cb()->pk($this->data['table']) ]);
+            unset($data[cb()->pk($this->data['table'])]);
 
-            if(Schema::hasColumn($this->data['table'], 'updated_at')) {
+            if (Schema::hasColumn($this->data['table'], 'updated_at')) {
                 $data['updated_at'] = date('Y-m-d H:i:s');
             }
 
             unset($data['created_at']);
 
-            if(isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) {
+            if (isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) {
                 $data = call_user_func($this->data['hook_before_update'], $id, $data);
             }
 
             cb()->update($this->data['table'], $id, $data);
 
-            if(isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) {
+            if (isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) {
                 call_user_func($this->data['hook_after_update'], $id);
             }
 
         } catch (CBValidationException $e) {
             Log::debug($e);
-            return cb()->redirectBack($e->getMessage(),'info');
+            return cb()->redirectBack($e->getMessage(), 'info');
         } catch (\Exception $e) {
             Log::error($e);
-            return cb()->redirectBack(cbLang("something_went_wrong"),'warning');
+            return cb()->redirectBack(cbLang("something_went_wrong"), 'warning');
         }
 
 
         if (Str::contains(request("submit"), cbLang("more"))) {
-            return cb()->redirectBack( cbLang("the_data_has_been_updated"), 'success');
+            return cb()->redirectBack(cbLang("the_data_has_been_updated"), 'success');
         } else {
-            if(verifyReferalUrl()) {
-                return cb()->redirect(getReferalUrl("url"),  cbLang("the_data_has_been_updated"), 'success');
+            if (verifyReferalUrl()) {
+                return cb()->redirect(getReferalUrl("url"), cbLang("the_data_has_been_updated"), 'success');
             } else {
-                return cb()->redirect(module()->url(),  cbLang("the_data_has_been_updated"), 'success');
+                return cb()->redirect(module()->url(), cbLang("the_data_has_been_updated"), 'success');
             }
 
         }
@@ -162,15 +162,15 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
-        if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
+        if (isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
             call_user_func($this->data['hook_before_delete'], $id);
         }
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
 
-        if ($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) {
+        if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) {
             DB::table($this->data['table'])
                 ->where(getPrimaryKey($this->data['table']), $id)
                 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
@@ -180,16 +180,16 @@ 
                 ->delete();
         }
 
-        if(isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) {
+        if (isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) {
             call_user_func($this->data['hook_after_delete'], $id);
         }
 
-        return cb()->redirectBack( cbLang("the_data_has_been_deleted"), 'success');
+        return cb()->redirectBack(cbLang("the_data_has_been_deleted"), 'success');
     }
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), $id)->first();
@@ -208,14 +208,14 @@ 
      */
     public function __call($method, $parameters)
     {
-        if($method == "getData") {
+        if ($method == "getData") {
             $key = $parameters[0];
-            if(isset($this->data[$key])) {
+            if (isset($this->data[$key])) {
                 return $this->data[$key];
-            }else{
+            } else {
                 return null;
             }
-        }else{
+        } else {
             return null;
         }
     }

Braces +23 added lines, -9 removed lines

@@ -32,7 +32,9 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canBrowse()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         $query = $this->repository();
         $result = $query->paginate( request("limit")?:cbConfig("LIMIT_TABLE_DATA") );
@@ -43,7 +45,9 @@ 
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : '.cbLang('add');
@@ -53,7 +57,9 @@ 
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         try {
             $this->validation();
@@ -102,7 +108,9 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -113,7 +121,9 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         try {
             $this->validation();
@@ -162,7 +172,9 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canDelete()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
             call_user_func($this->data['hook_before_delete'], $id);
@@ -189,7 +201,9 @@ 
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canRead()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), $id)->first();
@@ -212,10 +226,10 @@ 
             $key = $parameters[0];
             if(isset($this->data[$key])) {
                 return $this->data[$key];
-            }else{
+            } else{
                 return null;
             }
-        }else{
+        } else{
             return null;
         }
     }

src/controllers/traits/ColumnIntervention.php

Spacing +2 added lines, -2 removed lines

@@ -18,14 +18,14 @@
      */
     public function columnIntervention()
     {
-        if(request("sub_module") && Cache::has("subModule".request("sub_module")) && cb()->getCurrentMethod() != "getDetail") {
+        if (request("sub_module") && Cache::has("subModule".request("sub_module")) && cb()->getCurrentMethod() != "getDetail") {
             /*
              * If there is sub module, the column that has same name with foreign key should be remove
              * And change to hidden. So we can save the foreign Key id from the parent module.
              */
             $subModule = Cache::get("subModule".request("sub_module"));
             $this->removeColumn($subModule["foreignKey"])
-                ->addHidden($subModule["foreignKey"],$subModule['foreignKey'])
+                ->addHidden($subModule["foreignKey"], $subModule['foreignKey'])
                 ->defaultValue($subModule['foreignValue']);
         }
     }

src/controllers/traits/ControllerSetting.php

Indentation +15 added lines, -15 removed lines

@@ -202,13 +202,13 @@ 
         $parentPath = $this->getData("permalink");
         $parentTitle = $this->getData("page_title");
         $this->addActionButton($label,function($row) use ($label, $controllerName, $foreignKey, $additionalInfo, $parentPath, $parentTitle) {
-           $actionParameters = [
-               "label"=>$label,
-               "foreignKey"=>$foreignKey,
-               "foreignValue"=>$row->primary_key,
-               "parentPath"=>$parentPath,
-               "parentTitle"=>$parentTitle
-           ];
+            $actionParameters = [
+                "label"=>$label,
+                "foreignKey"=>$foreignKey,
+                "foreignValue"=>$row->primary_key,
+                "parentPath"=>$parentPath,
+                "parentTitle"=>$parentTitle
+            ];
 
             if(isset($additionalInfo) && is_callable($additionalInfo)) {
                 $additionalInfo = call_user_func($additionalInfo, $row);
@@ -217,15 +217,15 @@ 
                 }
             }
 
-           $actionHash = md5(serialize($actionParameters));
-           $actionHashToken = Cache::get("subModule".$actionHash);
-           if(!$actionHashToken) {
-               $actionHashToken = Str::random(5);
-               Cache::forever("subModule".$actionHash, $actionHashToken);
-               Cache::forever("subModule".$actionHashToken, $actionParameters);
-           }
+            $actionHash = md5(serialize($actionParameters));
+            $actionHashToken = Cache::get("subModule".$actionHash);
+            if(!$actionHashToken) {
+                $actionHashToken = Str::random(5);
+                Cache::forever("subModule".$actionHash, $actionHashToken);
+                Cache::forever("subModule".$actionHashToken, $actionParameters);
+            }
 
-           return action(class_basename($controllerName)."@getSubModule",['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle);
+            return action(class_basename($controllerName)."@getSubModule",['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle);
         }, $condition, $font, $color);
 
     }

Spacing +15 added lines, -15 removed lines

@@ -32,11 +32,11 @@ 
         $this->setButtonDetail(true);
         $this->setButtonSave(true);
         $this->setButtonLimitPage(true);
-        $this->hideButtonDeleteWhen(function ($row) { return false; });
-        $this->hideButtonDetailWhen(function ($row) { return false; });
-        $this->hideButtonEditWhen(function ($row) { return false; });
-        $this->style(function () { return null; });
-        $this->javascript(function () { return null; });
+        $this->hideButtonDeleteWhen(function($row) { return false; });
+        $this->hideButtonDetailWhen(function($row) { return false; });
+        $this->hideButtonEditWhen(function($row) { return false; });
+        $this->style(function() { return null; });
+        $this->javascript(function() { return null; });
     }
 
     public function style(callable $style) {
@@ -140,9 +140,9 @@ 
      * @param ButtonColor $color
      * @param string $attributes
      */
-    public function addIndexActionButton($label, $actionURL, $fontAwesome_icon=null, $color=null, $attributes = null)
+    public function addIndexActionButton($label, $actionURL, $fontAwesome_icon = null, $color = null, $attributes = null)
     {
-        $color = ($color)?:ButtonColor::DARK_BLUE;
+        $color = ($color) ?: ButtonColor::DARK_BLUE;
 
         $model = new IndexActionButtonModel();
         $model->setLabel($label);
@@ -201,7 +201,7 @@ 
     public function addSubModule($label, $controllerName, $foreignKey, callable $additionalInfo = null, callable $condition = null, $font = null, $color = null) {
         $parentPath = $this->getData("permalink");
         $parentTitle = $this->getData("page_title");
-        $this->addActionButton($label,function($row) use ($label, $controllerName, $foreignKey, $additionalInfo, $parentPath, $parentTitle) {
+        $this->addActionButton($label, function($row) use ($label, $controllerName, $foreignKey, $additionalInfo, $parentPath, $parentTitle) {
            $actionParameters = [
                "label"=>$label,
                "foreignKey"=>$foreignKey,
@@ -210,22 +210,22 @@ 
                "parentTitle"=>$parentTitle
            ];
 
-            if(isset($additionalInfo) && is_callable($additionalInfo)) {
+            if (isset($additionalInfo) && is_callable($additionalInfo)) {
                 $additionalInfo = call_user_func($additionalInfo, $row);
-                if(is_array($additionalInfo)) {
+                if (is_array($additionalInfo)) {
                     $actionParameters['info'] = $additionalInfo;
                 }
             }
 
            $actionHash = md5(serialize($actionParameters));
            $actionHashToken = Cache::get("subModule".$actionHash);
-           if(!$actionHashToken) {
+           if (!$actionHashToken) {
                $actionHashToken = Str::random(5);
                Cache::forever("subModule".$actionHash, $actionHashToken);
                Cache::forever("subModule".$actionHashToken, $actionParameters);
            }
 
-           return action(class_basename($controllerName)."@getSubModule",['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle);
+           return action(class_basename($controllerName)."@getSubModule", ['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle);
         }, $condition, $font, $color);
 
     }
@@ -238,12 +238,12 @@ 
      * @param $fontAwesome_icon
      * @param ButtonColor|string $color
      */
-    public function addActionButton($label, $url_target, $condition_callback=null, $fontAwesome_icon=null, $color=null, $confirmation = false)
+    public function addActionButton($label, $url_target, $condition_callback = null, $fontAwesome_icon = null, $color = null, $confirmation = false)
     {
         $new = new AddActionButtonModel();
         $new->setLabel($label);
-        $new->setIcon($fontAwesome_icon?:"fa fa-bars");
-        $new->setColor($color?:"primary");
+        $new->setIcon($fontAwesome_icon ?: "fa fa-bars");
+        $new->setColor($color ?: "primary");
         $new->setUrl($url_target);
         $new->setCondition($condition_callback);
         $new->setConfirmation($confirmation);

src/controllers/traits/Validation.php

Spacing +2 added lines, -2 removed lines

@@ -19,12 +19,12 @@
      */
     private function validation()
     {
-        if(isset($this->data['validation'])) {
+        if (isset($this->data['validation'])) {
             $validator = Validator::make(request()->all(), @$this->data['validation'], @$this->data['validation_messages']);
             if ($validator->fails()) {
                 $message = $validator->messages();
                 $message_all = $message->all();
-                throw new CBValidationException(implode(', ',$message_all));
+                throw new CBValidationException(implode(', ', $message_all));
             }
         }
     }

src/helpers/SidebarMenus.php

Spacing +23 added lines, -23 removed lines

@@ -23,7 +23,7 @@ 
     private function assignToModel($menu) {
         $model = new SidebarModel();
         $model->setId($menu->id);
-        if($menu->type == "url") {
+        if ($menu->type == "url") {
             $model->setUrl($menu->path);
             $model->setIcon($menu->icon);
             $model->setName($menu->name);
@@ -44,9 +44,9 @@ 
             $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl()));
         }
 
-        if(request()->is($model->getBasepath()."*")) {
+        if (request()->is($model->getBasepath()."*")) {
             $model->setIsActive(true);
-        }else{
+        } else {
             $model->setIsActive(false);
         }
 
@@ -55,22 +55,22 @@ 
 
     private function loadData($parent_id = null) {
         $menus = DB::table("cb_menus");
-        if($parent_id) {
-            $menus->where("parent_cb_menus_id",$parent_id);
-        }else{
+        if ($parent_id) {
+            $menus->where("parent_cb_menus_id", $parent_id);
+        } else {
             $menus->whereNull("parent_cb_menus_id");
         }
-        return $menus->orderBy("sort_number","asc")->get();
+        return $menus->orderBy("sort_number", "asc")->get();
     }
 
     private function rolePrivilege($cb_roles_id, $cb_menus_id) {
-        return cb()->find("cb_role_privileges",['cb_roles_id'=>$cb_roles_id,'cb_menus_id'=>$cb_menus_id]);
+        return cb()->find("cb_role_privileges", ['cb_roles_id'=>$cb_roles_id, 'cb_menus_id'=>$cb_menus_id]);
     }
 
-    private function checkPrivilege($roles_id,$menu) {
-        if($roles_id) {
+    private function checkPrivilege($roles_id, $menu) {
+        if ($roles_id) {
             $privilege = $this->rolePrivilege($roles_id, $menu->id);
-            if($privilege && !$privilege->can_browse) {
+            if ($privilege && !$privilege->can_browse) {
                 return false;
             }
         }
@@ -79,39 +79,39 @@ 
     }
 
     public function all($withPrivilege = true) {
-        $roles_id = ($withPrivilege)?cb()->session()->roleId():null;
+        $roles_id = ($withPrivilege) ?cb()->session()->roleId() : null;
         $idHash = "menuUser".$roles_id.auth()->id();
-        if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) return $menu;
+        if ($menu = CacheHelper::getItemInGroup($idHash, "sidebar_menu")) return $menu;
 
         $menus = $this->loadData();
         $result = [];
         $menus_active = false;
-        foreach($menus as $menu) {
+        foreach ($menus as $menu) {
 
-            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
+            if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
 
             $sidebarModel = $this->assignToModel($menu);
-            if($sidebarModel->getisActive()) $menus_active = true;
-            if($menus2 = $this->loadData($menu->id)) {
+            if ($sidebarModel->getisActive()) $menus_active = true;
+            if ($menus2 = $this->loadData($menu->id)) {
                 $sub1 = [];
                 $menus2_active = false;
                 foreach ($menus2 as $menu2) {
 
-                    if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
+                    if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
 
                     $sidebarModel2 = $this->assignToModel($menu2);
-                    if($sidebarModel2->getisActive()) $menus2_active = true;
+                    if ($sidebarModel2->getisActive()) $menus2_active = true;
 
-                    if($menus3 = $this->loadData($menu2->id)) {
+                    if ($menus3 = $this->loadData($menu2->id)) {
                         $sub2 = [];
                         $menus3_active = false;
                         foreach ($menus3 as $menu3) {
 
-                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
+                            if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
 
                             $sidebarModel3 = $this->assignToModel($menu3);
 
-                            if($sidebarModel3->getisActive()) {
+                            if ($sidebarModel3->getisActive()) {
                                 $menus3_active = true;
                             }
 
@@ -128,7 +128,7 @@ 
             $result[] = $sidebarModel;
         }
 
-        CacheHelper::putInGroup($idHash, $result,"sidebar_menu", 3600);
+        CacheHelper::putInGroup($idHash, $result, "sidebar_menu", 3600);
         return $result;
     }
 

Braces +22 added lines, -10 removed lines

@@ -28,7 +28,7 @@ 
             $model->setIcon($menu->icon);
             $model->setName($menu->name);
             $model->setBasepath(basename($model->getUrl()));
-        }elseif ($menu->type == "module") {
+        } elseif ($menu->type == "module") {
             $module = cb()->find("cb_modules", $menu->cb_modules_id);
             $className = '\App\Http\Controllers\\'.$module->controller;
             $controllerClass = new $className();
@@ -37,7 +37,7 @@ 
             $model->setIcon($module->icon);
             $model->setName($module->name);
             $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl()));
-        }elseif ($menu->type == "path") {
+        } elseif ($menu->type == "path") {
             $model->setUrl(cb()->getAdminUrl($menu->path));
             $model->setIcon($menu->icon);
             $model->setName($menu->name);
@@ -46,7 +46,7 @@ 
 
         if(request()->is($model->getBasepath()."*")) {
             $model->setIsActive(true);
-        }else{
+        } else{
             $model->setIsActive(false);
         }
 
@@ -57,7 +57,7 @@ 
         $menus = DB::table("cb_menus");
         if($parent_id) {
             $menus->where("parent_cb_menus_id",$parent_id);
-        }else{
+        } else{
             $menus->whereNull("parent_cb_menus_id");
         }
         return $menus->orderBy("sort_number","asc")->get();
@@ -81,33 +81,45 @@ 
     public function all($withPrivilege = true) {
         $roles_id = ($withPrivilege)?cb()->session()->roleId():null;
         $idHash = "menuUser".$roles_id.auth()->id();
-        if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) return $menu;
+        if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) {
+            return $menu;
+        }
 
         $menus = $this->loadData();
         $result = [];
         $menus_active = false;
         foreach($menus as $menu) {
 
-            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
+            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) {
+                continue;
+            }
 
             $sidebarModel = $this->assignToModel($menu);
-            if($sidebarModel->getisActive()) $menus_active = true;
+            if($sidebarModel->getisActive()) {
+                $menus_active = true;
+            }
             if($menus2 = $this->loadData($menu->id)) {
                 $sub1 = [];
                 $menus2_active = false;
                 foreach ($menus2 as $menu2) {
 
-                    if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
+                    if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) {
+                        continue;
+                    }
 
                     $sidebarModel2 = $this->assignToModel($menu2);
-                    if($sidebarModel2->getisActive()) $menus2_active = true;
+                    if($sidebarModel2->getisActive()) {
+                        $menus2_active = true;
+                    }
 
                     if($menus3 = $this->loadData($menu2->id)) {
                         $sub2 = [];
                         $menus3_active = false;
                         foreach ($menus3 as $menu3) {
 
-                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
+                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) {
+                                continue;
+                            }
 
                             $sidebarModel3 = $this->assignToModel($menu3);
 

src/helpers/MiscellanousSingleton.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
     public function hasData($key) {
         $data = $this->data;
-        if(isset($data[$key])) return true;
+        if (isset($data[$key])) return true;
         else return false;
     }
 

Braces +5 added lines, -2 removed lines

@@ -23,8 +23,11 @@
 
     public function hasData($key) {
         $data = $this->data;
-        if(isset($data[$key])) return true;
-        else return false;
+        if(isset($data[$key])) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     public function setData($key, $value): void

src/helpers/SchemaHelper.php

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
     public static function hasColumn($table, $column)
     {
         $columns = cb()->listAllColumns($table);
-        return in_array($column,$columns);
+        return in_array($column, $columns);
     }
 }
\ No newline at end of file