crocodic-studio / crudbooster

src/controllers/scaffolding/singletons/ColumnSingleton.php

Spacing +22 added lines, -22 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->getShowDetail()) {
+            if ($item->getShowDetail()) {
                 $newData[] = $item;
             }
         }
@@ -132,14 +132,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();
             }
         }
@@ -149,10 +149,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]);
             }
         }
@@ -162,7 +162,7 @@ 
     public function getColumnNameOnly()
     {
         $result = [];
-        foreach($this->columns as $column) {
+        foreach ($this->columns as $column) {
             /** @var ColumnModel $column */
             $result[] = $column->getName();
         }

Braces +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
             /** @var ColumnModel $column */
             if($data_row) {
                 $value = (isset($data_row->{$column->getField()}))?$data_row->{ $column->getField() }:null;
-            }else{
+            } else{
                 $value = request($column->getName());
 
                 if(!$value && $column->getDefaultValue()) {
@@ -139,7 +139,7 @@ 
                 foreach($column->getValue() as $key=>$val) {
                     $data[$key] = $val;
                 }
-            }else{
+            } else{
                 $data[$column->getField()] = $column->getValue();
             }
         }

src/controllers/scaffolding/traits/ColumnsBasic.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 
     private function name($label, $name = null)
     {
-        return (!$name)?strtolower(slug($label,"_")):$name;
+        return (!$name) ?strtolower(slug($label, "_")) : $name;
     }
 
     /**
@@ -39,8 +39,8 @@ 
         $model->setShowAdd(true);
         $model->setShowEdit(true);
         $model->setShowDetail(true);
-        $model->setIndexDisplayTransform(function ($value, $row) { return $value; });
-        $model->setDetailDisplayTransform(function ($value, $row) { return $value; });
+        $model->setIndexDisplayTransform(function($value, $row) { return $value; });
+        $model->setDetailDisplayTransform(function($value, $row) { return $value; });
         return $model;
     }
 

src/controllers/CBController.php

Spacing +49 added lines, -49 removed lines

@@ -26,14 +26,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;
         }
     }
@@ -48,19 +48,19 @@ 
 
         $query->addSelect($this->data['table'].'.'.cb()->pk($this->data['table']).' as primary_key');
 
-        if(isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index']))
+        if (isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index']))
         {
             $query = call_user_func($this->data['hook_query_index'], $query);
         }
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
-        if($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) {
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
+        if ($softDelete === true && Schema::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'],
@@ -70,12 +70,12 @@ 
             }
         }
 
-        foreach($columns as $column) {
+        foreach ($columns as $column) {
             /** @var ColumnModel $column */
-            if($column->getType() != "custom") {
-                if(strpos($column->getField(),".") === false) {
+            if ($column->getType() != "custom") {
+                if (strpos($column->getField(), ".") === false) {
                     $query->addSelect($this->data['table'].'.'.$column->getField());
-                }else{
+                } else {
                     $query->addSelect($column->getField());
                 }
             }
@@ -83,20 +83,20 @@ 
             $query = getTypeHook($column->getType())->query($query, $column);
         }
 
-        if(request()->has('q'))
+        if (request()->has('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) {
+            } else {
+                $query->where(function($where) use ($columns) {
                     /**
                      * @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', '%'.request('q').'%');
@@ -105,17 +105,17 @@ 
             }
         }
 
-        if(isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) {
+        if (isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) {
             $query = call_user_func($this->data['hook_query_index'], $query);
         }
 
 
-        if(request()->has(['order_by','order_sort']))
+        if (request()->has(['order_by', 'order_sort']))
         {
-            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 {
             $query->orderBy($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), "desc");
         }
 
@@ -124,7 +124,7 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         $query = $this->repository();
         $result = $query->paginate(20);
@@ -139,29 +139,29 @@ 
      */
     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));
             }
         }
     }
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : 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(),"You do not have a privilege access to this area");
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         try {
             $this->validation();
@@ -169,24 +169,24 @@ 
             $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');
             }
 
             $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($e->getMessage(),'warning');
+            return cb()->redirectBack($e->getMessage(), 'warning');
         }
 
         if (request('submit') == trans('crudbooster.button_save_more')) {
@@ -198,7 +198,7 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -209,7 +209,7 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         try {
             $this->validation();
@@ -217,13 +217,13 @@ 
             $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'], '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_update']) && is_callable($this->data['hook_before_update'])) {
+            if (isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) {
                 call_user_func($this->data['hook_before_update'], $id);
             }
 
@@ -231,16 +231,16 @@ 
                 ->where(cb()->pk($this->data['table']), $id)
                 ->update($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($e->getMessage(),'warning');
+            return cb()->redirectBack($e->getMessage(), 'warning');
         }
 
 
@@ -253,15 +253,15 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access 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')]);
@@ -271,7 +271,7 @@ 
                 ->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);
         }
 
@@ -280,7 +280,7 @@ 
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();

Braces +27 added lines, -13 removed lines

@@ -30,10 +30,10 @@ 
             $key = $parameters[0];
             if(isset($this->data[$key])) {
                 return $this->data[$key];
-            }else{
+            } else{
                 return null;
             }
-        }else{
+        } else{
             return null;
         }
     }
@@ -75,7 +75,7 @@ 
             if($column->getType() != "custom") {
                 if(strpos($column->getField(),".") === false) {
                     $query->addSelect($this->data['table'].'.'.$column->getField());
-                }else{
+                } else{
                     $query->addSelect($column->getField());
                 }
             }
@@ -87,7 +87,7 @@ 
         {
             if(isset($this->data['hook_search_query'])) {
                 $query = call_user_func($this->data['hook_search_query'], $query);
-            }else{
+            } else{
                 $query->where(function ($where) use ($columns) {
                     /**
                      * @var $where Builder
@@ -96,7 +96,7 @@ 
                     {
                         if(strpos($column->getField(),".") === false) {
                             $field = $this->data['table'].'.'.$column->getField();
-                        }else{
+                        } else{
                             $field = $column->getField();
                         }
                         $where->orWhere($field, 'like', '%'.request('q').'%');
@@ -115,7 +115,7 @@ 
             if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) {
                 $query->orderBy(request('order_by'), request('order_sort'));
             }
-        }else{
+        } else{
             $query->orderBy($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), "desc");
         }
 
@@ -124,7 +124,9 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if(!module()->canBrowse()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        }
 
         $query = $this->repository();
         $result = $query->paginate(20);
@@ -151,7 +153,9 @@ 
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        }
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : Add';
@@ -161,7 +165,9 @@ 
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        }
 
         try {
             $this->validation();
@@ -198,7 +204,9 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -209,7 +217,9 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        }
 
         try {
             $this->validation();
@@ -253,7 +263,9 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if(!module()->canDelete()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access 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);
@@ -280,7 +292,9 @@ 
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if(!module()->canRead()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();

src/types/TypesHook.php

Spacing +2 added lines, -2 removed lines

@@ -26,12 +26,12 @@
 
     public function indexRender($row, $column)
     {
-        return (isset($row->{$column->getField()}))?$row->{ $column->getField() }:null;
+        return (isset($row->{$column->getField()})) ? $row->{ $column->getField() }:null;
     }
 
     public function detailRender($row, $column)
     {
-        return (isset($row->{$column->getField()}))?$row->{ $column->getField() }:null;
+        return (isset($row->{$column->getField()})) ? $row->{ $column->getField() }:null;
     }
 
     /**

src/types/select/Select.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function optionsFromTable($table, $key_field, $display_field, $SQLCondition = null) {
         $data = DB::table($table);
-        if($SQLCondition && is_callable($SQLCondition)) {
+        if ($SQLCondition && is_callable($SQLCondition)) {
             $data = call_user_func($SQLCondition, $data);
         }elseif ($SQLCondition && is_string($SQLCondition)) {
             $data->whereRaw($SQLCondition);
@@ -49,11 +49,11 @@ 
         $data = $data->get();
         $options = [];
         foreach ($data as $d) {
-            $options[ $d->$key_field ] = $d->$display_field;
+            $options[$d->$key_field] = $d->$display_field;
         }
         $data = columnSingleton()->getColumn($this->index);
         /** @var $data SelectModel */
-        $data->setOptionsFromTable(["table"=>$table,"key_field"=>$key_field,"display_field"=>$display_field,"sql_condition"=>$SQLCondition]);
+        $data->setOptionsFromTable(["table"=>$table, "key_field"=>$key_field, "display_field"=>$display_field, "sql_condition"=>$SQLCondition]);
         columnSingleton()->setColumn($this->index, $data);
 
         $this->options($options);
@@ -69,10 +69,10 @@ 
         columnSingleton()->setColumn($this->index, $data);
 
         $result = call_user_func($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);
         }