Merge pull request #311 from terzinnorbert/master

Controller cleaning

Author: jeremykenedy

app/Http/Controllers/ThemesManagementController.php

@@ -78,72 +78,37 @@ public function store(Request $request)
     /**
      * Display the specified resource.
      *
-     * @param int $id
-     *
+     * @param Theme $theme
      * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show(Theme $theme)
     {
-        $theme = Theme::find($id);
-        $users = User::all();
-        $themeUsers = [];
-
-        foreach ($users as $user) {
-            if ($user->profile && $user->profile->theme_id === $theme->id) {
-                $themeUsers[] = $user;
-            }
-        }
-
-        $data = [
-            'theme'      => $theme,
-            'themeUsers' => $themeUsers,
-        ];
-
-        return view('themesmanagement.show-theme')->with($data);
+        return view('themesmanagement.show-theme')->with($this->getThemeData($theme));
     }
 
     /**
      * Show the form for editing the specified resource.
      *
-     * @param int $id
-     *
+     * @param Theme $theme
      * @return \Illuminate\Http\Response
      */
-    public function edit($id)
+    public function edit(Theme $theme)
     {
-        $theme = Theme::find($id);
-        $users = User::all();
-        $themeUsers = [];
-
-        foreach ($users as $user) {
-            if ($user->profile && $user->profile->theme_id === $theme->id) {
-                $themeUsers[] = $user;
-            }
-        }
-
-        $data = [
-            'theme'      => $theme,
-            'themeUsers' => $themeUsers,
-        ];
-
-        return view('themesmanagement.edit-theme')->with($data);
+        return view('themesmanagement.edit-theme')->with($this->getThemeData($theme));
     }
 
     /**
      * Update the specified resource in storage.
      *
      * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     *
+     * @param Theme                    $theme
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, Theme $theme)
     {
-        $theme = Theme::find($id);
-
         $input = $request->only('name', 'link', 'notes', 'status');
 
-        $validator = Validator::make($input, Theme::rules($id));
+        $validator = Validator::make($input, Theme::rules($theme->id));
 
         if ($validator->fails()) {
             return back()->withErrors($validator)->withInput();
@@ -157,14 +122,12 @@ public function update(Request $request, $id)
     /**
      * Remove the specified resource from storage.
      *
-     * @param int $id
-     *
+     * @param Theme $theme
      * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy(Theme $theme)
     {
-        $default = Theme::findOrFail(1);
-        $theme = Theme::findOrFail($id);
+        $default = Theme::findOrFail(Theme::default);
 
         if ($theme->id != $default->id) {
             $theme->delete();
@@ -174,4 +137,26 @@ public function destroy($id)
 
         return back()->with('error', trans('themes.deleteSelfError'));
     }
+
+    /**
+     * @param Theme $theme
+     * @return array
+     */
+    protected function getThemeData(Theme $theme): array
+    {
+        $users = User::all();
+        $themeUsers = [];
+
+        foreach ($users as $user) {
+            if ($user->profile && $user->profile->theme_id === $theme->id) {
+                $themeUsers[] = $user;
+            }
+        }
+
+        $data = [
+            'theme' => $theme,
+            'themeUsers' => $themeUsers,
+        ];
+        return $data;
+    }
 }

app/Http/Controllers/UsersManagementController.php

@@ -30,8 +30,8 @@ public function __construct()
      */
     public function index()
     {
-        $pagintaionEnabled = config('usersmanagement.enablePagination');
-        if ($pagintaionEnabled) {
+        $paginationEnabled = config('usersmanagement.enablePagination');
+        if ($paginationEnabled) {
             $users = User::paginate(config('usersmanagement.paginateListSize'));
         } else {
             $users = User::all();
@@ -50,11 +50,7 @@ public function create()
     {
         $roles = Role::all();
 
-        $data = [
-            'roles' => $roles,
-        ];
-
-        return view('usersmanagement.create-user')->with($data);
+        return view('usersmanagement.create-user', compact('roles'));
     }
 
     /**
@@ -118,31 +114,26 @@ public function store(Request $request)
     /**
      * Display the specified resource.
      *
-     * @param int $id
-     *
+     * @param User $user
      * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show(User $user)
     {
-        $user = User::find($id);
-
-        return view('usersmanagement.show-user')->withUser($user);
+        return view('usersmanagement.show-user', compact('user'));
     }
 
     /**
      * Show the form for editing the specified resource.
      *
-     * @param int $id
-     *
+     * @param User $user
      * @return \Illuminate\Http\Response
      */
-    public function edit($id)
+    public function edit(User $user)
     {
-        $user = User::findOrFail($id);
         $roles = Role::all();
 
-        foreach ($user->roles as $user_role) {
-            $currentRole = $user_role;
+        foreach ($user->roles as $userRole) {
+            $currentRole = $userRole;
         }
 
         $data = [
@@ -158,14 +149,11 @@ public function edit($id)
      * Update the specified resource in storage.
      *
      * @param \Illuminate\Http\Request $request
-     * @param int                      $id
-     *
+     * @param User                     $user
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, User $user)
     {
-        $currentUser = Auth::user();
-        $user = User::find($id);
         $emailCheck = ($request->input('email') != '') && ($request->input('email') != $user->email);
         $ipAddress = new CaptureIpTrait();
 
@@ -177,7 +165,7 @@ public function update(Request $request, $id)
             ]);
         } else {
             $validator = Validator::make($request->all(), [
-                'name'     => 'required|max:255|unique:users,name,'.$id,
+                'name' => 'required|max:255|unique:users,name,' . $user->id,
                 'password' => 'nullable|confirmed|min:6',
             ]);
         }
@@ -224,14 +212,12 @@ public function update(Request $request, $id)
     /**
      * Remove the specified resource from storage.
      *
-     * @param int $id
-     *
+     * @param User $user
      * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy(User $user)
     {
         $currentUser = Auth::user();
-        $user = User::findOrFail($id);
         $ipAddress = new CaptureIpTrait();
 
         if ($user->id != $currentUser->id) {

app/Http/ViewComposers/ThemeComposer.php

@@ -39,7 +39,7 @@ public function compose(View $view)
                 $theme = Theme::find($user->profile->theme_id);
 
                 if ($theme->status == 0) {
-                    $theme = Theme::find(1);
+                    $theme = Theme::find(Theme::default);
                 }
             }
         }

app/Models/Theme.php

@@ -8,6 +8,7 @@
 class Theme extends Model
 {
     use SoftDeletes;
+    const default = 1;
 
     /**
      * The database table used by the model.