crocodic-studio / crudbooster

src/controllers/traits/Query.php

Spacing +21 added lines, -21 removed lines

@@ -24,13 +24,13 @@ 
 
         $query->addSelect($this->data['table'].'.'.cb()->pk($this->data['table']).' as primary_key');
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
-        if($softDelete === true && SchemaHelper::hasColumn($this->data['table'],'deleted_at')) {
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
+        if ($softDelete === true && SchemaHelper::hasColumn($this->data['table'], 'deleted_at')) {
             $query->whereNull($this->data['table'].'.deleted_at');
         }
 
-        if(isset($joins)) {
-            foreach($joins as $join)
+        if (isset($joins)) {
+            foreach ($joins as $join)
             {
                 $query->join($join['target_table'],
                     $join['target_table_primary'],
@@ -40,14 +40,14 @@ 
             }
         }
 
-        foreach($columns as $column) {
+        foreach ($columns as $column) {
             /** @var ColumnModel $column */
-            if($column->getType() != "custom") {
-                if(strpos($column->getField(),".") === false) {
-                    if(SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
+            if ($column->getType() != "custom") {
+                if (strpos($column->getField(), ".") === false) {
+                    if (SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
                         $query->addSelect($this->data['table'].'.'.$column->getField());
                     }
-                }else{
+                } else {
                     $query->addSelect($column->getField());
                 }
             }
@@ -55,20 +55,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').'%');
@@ -79,21 +79,21 @@ 
 
 
         // Callback From this Method
-        if(isset($callback) && is_callable($callback)) {
+        if (isset($callback) && is_callable($callback)) {
             $query = call_user_func($callback, $query);
         }
 
-        if(isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) {
+        if (isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) {
             $query = call_user_func($this->data['hook_index_query'], $query);
         }
 
 
-        if(request()->has(['order_by','order_sort']))
+        if (request()->has(['order_by', 'order_sort']))
         {
-            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");
         }
 

Braces +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
                     if(SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
                         $query->addSelect($this->data['table'].'.'.$column->getField());
                     }
-                }else{
+                } else{
                     $query->addSelect($column->getField());
                 }
             }
@@ -59,7 +59,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
@@ -68,7 +68,7 @@ 
                     {
                         if(strpos($column->getField(),".") === false) {
                             $field = $this->data['table'].'.'.$column->getField();
-                        }else{
+                        } else{
                             $field = $column->getField();
                         }
                         $where->orWhere($field, 'like', '%'.request('q').'%');
@@ -93,7 +93,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");
         }
 

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

src/helpers/CB.php

Spacing +44 added lines, -44 removed lines

@@ -24,7 +24,7 @@ 
     }
 
     public function getRoleByName($roleName) {
-        return $this->find("cb_roles",['name'=>$roleName]);
+        return $this->find("cb_roles", ['name'=>$roleName]);
     }
 
     public function fcm() {
@@ -40,7 +40,7 @@ 
     }
 
     public function getDeveloperUrl($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return url("developer/".getSetting("developer_path")).$path;
     }
 
@@ -57,16 +57,16 @@ 
     }
 
     public function getAdminPath() {
-        return getSetting("ADMIN_PATH","admin");
+        return getSetting("ADMIN_PATH", "admin");
     }
 
     public function getAdminUrl($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return url($this->getAdminPath()).$path;
     }
 
     public function getAppName() {
-        return getSetting("APP_NAME", env("APP_NAME","CRUDBOOSTER"));
+        return getSetting("APP_NAME", env("APP_NAME", "CRUDBOOSTER"));
     }
 
     /**
@@ -80,16 +80,16 @@ 
      */
     private function uploadFileProcess($filename, $extension, $file, $encrypt = true, $resize_width = null, $resize_height = null)
     {
-        if(in_array($extension,cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
+        if (in_array($extension, cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
             $file_path = cbConfig("UPLOAD_PATH_FORMAT");
-            $file_path = str_replace("{Y}",date('Y'), $file_path);
+            $file_path = str_replace("{Y}", date('Y'), $file_path);
             $file_path = str_replace("{m}", date('m'), $file_path);
             $file_path = str_replace("{d}", date("d"), $file_path);
 
             //Create Directory Base On Template
             Storage::makeDirectory($file_path);
-            Storage::put($file_path."/index.html"," ","public");
-            Storage::put($file_path."/.gitignore","!.gitignore","public");
+            Storage::put($file_path."/index.html", " ", "public");
+            Storage::put($file_path."/.gitignore", "!.gitignore", "public");
 
             if ($encrypt == true) {
                 $filename = md5(strRandom(5)).'.'.$extension;
@@ -97,17 +97,17 @@ 
                 $filename = slug($filename, '_').'.'.$extension;
             }
 
-            if($resize_width || $resize_height) {
+            if ($resize_width || $resize_height) {
                 $this->resizeImage($file, $file_path.'/'.$filename, $resize_width, $resize_height);
                 return $file_path.'/'.$filename;
-            }else{
+            } else {
                 if (Storage::putFileAs($file_path, $file, $filename, 'public')) {
                     return $file_path.'/'.$filename;
                 } else {
                     throw new \Exception("Something went wrong, file can't upload!");
                 }
             }
-        }else{
+        } else {
             throw new \Exception("The file format is not allowed!");
         }
     }
@@ -123,16 +123,16 @@ 
     {
         $fileData = base64_decode($base64_value);
         $mime_type = finfo_buffer(finfo_open(), $fileData, FILEINFO_MIME_TYPE);
-        if($mime_type) {
-            if($mime_type = explode('/', $mime_type)) {
+        if ($mime_type) {
+            if ($mime_type = explode('/', $mime_type)) {
                 $ext = $mime_type[1];
-                if($filename && $ext) {
+                if ($filename && $ext) {
                     return $this->uploadFileProcess($filename, $ext, $fileData, $encrypt, $resize_width, $resize_height);
                 }
-            }else {
+            } else {
                 throw new \Exception("Mime type not found");
             }
-        }else{
+        } else {
             throw new \Exception("Mime type not found");
         }
     }
@@ -152,7 +152,7 @@ 
             $filename = $file->getClientOriginalName();
             $ext = strtolower($file->getClientOriginalExtension());
 
-            if($filename && $ext) {
+            if ($filename && $ext) {
                 return $this->uploadFileProcess($filename, $ext, $file, $encrypt, $resize_width, $resize_height);
             }
 
@@ -187,29 +187,29 @@ 
             if ($resize_width && $resize_height) {
                 $img->fit($resize_width, $resize_height);
 
-            } elseif ($resize_width && ! $resize_height) {
+            } elseif ($resize_width && !$resize_height) {
 
-                $img->resize($resize_width, null, function ($constraint) {
+                $img->resize($resize_width, null, function($constraint) {
                     $constraint->aspectRatio();
                 });
 
-            } elseif (! $resize_width && $resize_height) {
+            } elseif (!$resize_width && $resize_height) {
 
-                $img->resize(null, $resize_height, function ($constraint) {
+                $img->resize(null, $resize_height, function($constraint) {
                     $constraint->aspectRatio();
                 });
 
             } else {
 
                 if ($img->width() > cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES")) {
-                    $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function ($constraint) {
+                    $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function($constraint) {
                         $constraint->aspectRatio();
                     });
                 }
             }
 
             Storage::put($fullFilePath, $img, 'public');
-        }else{
+        } else {
             throw new \Exception("The file format is not allowed!");
         }
     }
@@ -233,7 +233,7 @@ 
     {
         if (is_array($id)) {
             $idHash = md5("find".$table.serialize($id));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $first = DB::table($table);
             foreach ($id as $k => $v) {
@@ -241,15 +241,15 @@ 
             }
 
             $data = $first->first();
-            miscellanousSingleton()->setData($idHash,$data);
+            miscellanousSingleton()->setData($idHash, $data);
             return $data;
         } else {
             $idHash = md5("find".$table.$id);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $pk = $this->pk($table);
             $data = DB::table($table)->where($pk, $id)->first();
-            miscellanousSingleton()->setData($idHash,$data);
+            miscellanousSingleton()->setData($idHash, $data);
             return $data;
         }
     }
@@ -264,30 +264,30 @@ 
         $data = [];
         $idHash = null;
 
-        if(is_array($conditionOrCallback)) {
+        if (is_array($conditionOrCallback)) {
             $idHash = md5("findAll".$table.serialize($conditionOrCallback));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $data = DB::table($table)->where($conditionOrCallback)->get();
         } elseif (is_callable($conditionOrCallback)) {
             $idHash = "findAll".$table.spl_object_hash($conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $data = DB::table($table);
             $data = call_user_func($conditionOrCallback, $data);
             $data = $data->get();
         } else {
             $idHash = md5("findAll".$table.$conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $data = DB::table($table);
-            if($conditionOrCallback) {
+            if ($conditionOrCallback) {
                 $data = $data->whereRaw($conditionOrCallback);
             }
             $data = $data->get();
         }
 
-        if($idHash && $data) {
+        if ($idHash && $data) {
             miscellanousSingleton()->setData($idHash, $data);
         }
 
@@ -297,7 +297,7 @@ 
     public function listAllTable()
     {
         $idHash = md5("listAllTable");
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
         $data = DB::connection()->getDoctrineSchemaManager()->listTableNames();
         miscellanousSingleton()->setData($idHash, $data);
         return $data;
@@ -306,7 +306,7 @@ 
     public function listAllColumns($table)
     {
         $idHash = md5("listAllColumns".$table);
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
         $data = Schema::getColumnListing($table);
         miscellanousSingleton()->setData($idHash, $data);
         return $data;
@@ -374,7 +374,7 @@ 
         $validator = Validator::make($input_arr, $rules, $messages);
         if ($validator->fails()) {
             $message = $validator->errors()->all();
-            throw new CBValidationException(implode("; ",$message));
+            throw new CBValidationException(implode("; ", $message));
         }
     }
 
@@ -386,7 +386,7 @@ 
     public function findPrimaryKey($table)
     {
         $pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
-        if(!$pk) {
+        if (!$pk) {
             return null;
         }
         return $pk->getColumns()[0];
@@ -435,7 +435,7 @@ 
             $string_parameters_array = explode('&', $string_parameters);
             foreach ($string_parameters_array as $s) {
                 $part = explode('=', $s);
-                if(isset($part[0]) && isset($part[1])) {
+                if (isset($part[0]) && isset($part[1])) {
                     $name = htmlspecialchars(urldecode($part[0]));
                     $name = strip_tags($name);
                     $value = htmlspecialchars(urldecode($part[1]));
@@ -452,16 +452,16 @@ 
 
 
     public function routeGet($prefix, $controller) {
-        $alias = str_replace("@"," ", $controller);
+        $alias = str_replace("@", " ", $controller);
         $alias = ucwords($alias);
-        $alias = str_replace(" ","",$alias);
+        $alias = str_replace(" ", "", $alias);
         Route::get($prefix, ['uses' => $controller, 'as' => $alias]);
     }
 
     public function routePost($prefix, $controller) {
-        $alias = str_replace("@"," ", $controller);
+        $alias = str_replace("@", " ", $controller);
         $alias = ucwords($alias);
-        $alias = str_replace(" ","",$alias);
+        $alias = str_replace(" ", "", $alias);
         Route::post($prefix, ['uses' => $controller, 'as' => $alias]);
     }
 
@@ -494,7 +494,7 @@ 
 
         $prefix = trim($prefix, '/').'/';
 
-        if(substr($controller,0,1) != "\\") {
+        if (substr($controller, 0, 1) != "\\") {
             $controller = "\App\Http\Controllers\\".$controller;
         }
 

Braces +26 added lines, -12 removed lines

@@ -100,14 +100,14 @@ 
             if($resize_width || $resize_height) {
                 $this->resizeImage($file, $file_path.'/'.$filename, $resize_width, $resize_height);
                 return $file_path.'/'.$filename;
-            }else{
+            } else{
                 if (Storage::putFileAs($file_path, $file, $filename, 'public')) {
                     return $file_path.'/'.$filename;
                 } else {
                     throw new \Exception("Something went wrong, file can't upload!");
                 }
             }
-        }else{
+        } else{
             throw new \Exception("The file format is not allowed!");
         }
     }
@@ -129,10 +129,10 @@ 
                 if($filename && $ext) {
                     return $this->uploadFileProcess($filename, $ext, $fileData, $encrypt, $resize_width, $resize_height);
                 }
-            }else {
+            } else {
                 throw new \Exception("Mime type not found");
             }
-        }else{
+        } else{
             throw new \Exception("Mime type not found");
         }
     }
@@ -209,7 +209,7 @@ 
             }
 
             Storage::put($fullFilePath, $img, 'public');
-        }else{
+        } else{
             throw new \Exception("The file format is not allowed!");
         }
     }
@@ -233,7 +233,9 @@ 
     {
         if (is_array($id)) {
             $idHash = md5("find".$table.serialize($id));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $first = DB::table($table);
             foreach ($id as $k => $v) {
@@ -245,7 +247,9 @@ 
             return $data;
         } else {
             $idHash = md5("find".$table.$id);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $pk = $this->pk($table);
             $data = DB::table($table)->where($pk, $id)->first();
@@ -266,19 +270,25 @@ 
 
         if(is_array($conditionOrCallback)) {
             $idHash = md5("findAll".$table.serialize($conditionOrCallback));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $data = DB::table($table)->where($conditionOrCallback)->get();
         } elseif (is_callable($conditionOrCallback)) {
             $idHash = "findAll".$table.spl_object_hash($conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $data = DB::table($table);
             $data = call_user_func($conditionOrCallback, $data);
             $data = $data->get();
         } else {
             $idHash = md5("findAll".$table.$conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $data = DB::table($table);
             if($conditionOrCallback) {
@@ -297,7 +307,9 @@ 
     public function listAllTable()
     {
         $idHash = md5("listAllTable");
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if(miscellanousSingleton()->hasData($idHash)) {
+            return miscellanousSingleton()->getData($idHash);
+        }
         $data = DB::connection()->getDoctrineSchemaManager()->listTableNames();
         miscellanousSingleton()->setData($idHash, $data);
         return $data;
@@ -306,7 +318,9 @@ 
     public function listAllColumns($table)
     {
         $idHash = md5("listAllColumns".$table);
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if(miscellanousSingleton()->hasData($idHash)) {
+            return miscellanousSingleton()->getData($idHash);
+        }
         $data = Schema::getColumnListing($table);
         miscellanousSingleton()->setData($idHash, $data);
         return $data;

src/helpers/CacheHelper.php

Spacing +6 added lines, -6 removed lines

@@ -15,10 +15,10 @@ 
 {
     public static function putInGroup($key, $value, $group, $duration) {
         $key = md5($key);
-        $exist = (Cache::get($group))?:[];
-        $exist[ $key ] = ['value'=>$value,'duration'=>$duration];
+        $exist = (Cache::get($group)) ?: [];
+        $exist[$key] = ['value'=>$value, 'duration'=>$duration];
 
-        if($duration == -1) {
+        if ($duration == -1) {
             Cache::forever($group, $exist);
         } else {
             Cache::put($group, $exist, $duration);
@@ -28,7 +28,7 @@ 
     public static function getItemInGroup($key, $group) {
         $groupdata = Cache::get($group);
         $key = md5($key);
-        if(isset($groupdata[$key])) {
+        if (isset($groupdata[$key])) {
             return $groupdata[$key]['value'];
         }
         return null;
@@ -38,11 +38,11 @@ 
         Cache::forget($group);
     }
 
-    public static function forgetInGroup($key,$group) {
+    public static function forgetInGroup($key, $group) {
         $key = md5($key);
         $data = Cache::get($group);
         $duration = null;
-        if(isset($data[$key])) {
+        if (isset($data[$key])) {
             $item = $data[$key];
             unset($data[$key]);
         }