Skip to content

Commit

Permalink
Merge pull request #318 from jeremykenedy/analysis-qgAjx1
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
jeremykenedy authored Nov 20, 2019
2 parents 8485007 + 0d2c244 commit c585363
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
8 changes: 7 additions & 1 deletion app/Http/Controllers/ThemesManagementController.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public function store(Request $request)
* Display the specified resource.
*
* @param Theme $theme
*
* @return \Illuminate\Http\Response
*/
public function show(Theme $theme)
Expand All @@ -90,6 +91,7 @@ public function show(Theme $theme)
* Show the form for editing the specified resource.
*
* @param Theme $theme
*
* @return \Illuminate\Http\Response
*/
public function edit(Theme $theme)
Expand All @@ -102,6 +104,7 @@ public function edit(Theme $theme)
*
* @param \Illuminate\Http\Request $request
* @param Theme $theme
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Theme $theme)
Expand All @@ -123,6 +126,7 @@ public function update(Request $request, Theme $theme)
* Remove the specified resource from storage.
*
* @param Theme $theme
*
* @return \Illuminate\Http\Response
*/
public function destroy(Theme $theme)
Expand All @@ -140,6 +144,7 @@ public function destroy(Theme $theme)

/**
* @param Theme $theme
*
* @return array
*/
protected function getThemeData(Theme $theme): array
Expand All @@ -154,9 +159,10 @@ protected function getThemeData(Theme $theme): array
}

$data = [
'theme' => $theme,
'theme' => $theme,
'themeUsers' => $themeUsers,
];

return $data;
}
}
6 changes: 5 additions & 1 deletion app/Http/Controllers/UsersManagementController.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ public function store(Request $request)
* Display the specified resource.
*
* @param User $user
*
* @return \Illuminate\Http\Response
*/
public function show(User $user)
Expand All @@ -126,6 +127,7 @@ public function show(User $user)
* Show the form for editing the specified resource.
*
* @param User $user
*
* @return \Illuminate\Http\Response
*/
public function edit(User $user)
Expand All @@ -150,6 +152,7 @@ public function edit(User $user)
*
* @param \Illuminate\Http\Request $request
* @param User $user
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, User $user)
Expand All @@ -165,7 +168,7 @@ public function update(Request $request, User $user)
]);
} else {
$validator = Validator::make($request->all(), [
'name' => 'required|max:255|unique:users,name,' . $user->id,
'name' => 'required|max:255|unique:users,name,'.$user->id,
'password' => 'nullable|confirmed|min:6',
]);
}
Expand Down Expand Up @@ -213,6 +216,7 @@ public function update(Request $request, User $user)
* Remove the specified resource from storage.
*
* @param User $user
*
* @return \Illuminate\Http\Response
*/
public function destroy(User $user)
Expand Down

0 comments on commit c585363

Please sign in to comment.