Skip to content

Commit 79f5dc4

Browse files
stanislawfortonskistanislawfortonski
committed
Better syntax
1 parent 89dc9e6 commit 79f5dc4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2069
-1513
lines changed

‎app/Http/Controllers/API/AuthorsController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ class AuthorsController extends Controller
1212
* Display the specified resource.
1313
*
1414
* @param \App\Models\User $user
15-
* @return \Illuminate\Http\Response
15+
* @return \App\Http\Resources\UserResource
1616
*/
17-
public function __invoke(User $user)
17+
public function __invoke(User $user): UserResource
1818
{
1919
return new UserResource($user);
2020
}

‎app/Http/Controllers/API/CategoriesController.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ class CategoriesController extends Controller
1313
* Display a listing of the resource.
1414
*
1515
* @param \Illuminate\Http\Request $request
16-
* @return \Illuminate\Http\Response
1716
*/
1817
public function index(Request $request)
1918
{
@@ -25,9 +24,9 @@ public function index(Request $request)
2524
* Display the specified resource.
2625
*
2726
* @param \App\Models\Category $category
28-
* @return \Illuminate\Http\Response
27+
* @return \App\Http\Resources\CategoryResource
2928
*/
30-
public function show(Category $category)
29+
public function show(Category $category): CategoryResource
3130
{
3231
if (!empty($category->contents))
3332
return new CategoryResource($category);

‎app/Http/Controllers/API/PostsController.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ class PostsController extends Controller
1313
* Display a listing of the resource.
1414
*
1515
* @param \Illuminate\Http\Request $request
16-
* @return \Illuminate\Http\Response
1716
*/
1817
public function index(Request $request)
1918
{
@@ -25,9 +24,9 @@ public function index(Request $request)
2524
* Display the specified resource.
2625
*
2726
* @param \App\Models\Post $post
28-
* @return \Illuminate\Http\Response
27+
* @return \App\Http\Resources\PostResource
2928
*/
30-
public function show(Post $post)
29+
public function show(Post $post): PostResource
3130
{
3231
if ($post->isVisible() && !empty($post->contents))
3332
return new PostResource($post);

‎app/Http/Controllers/Admin/AdminController.php‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,38 @@
33
namespace App\Http\Controllers\Admin;
44

55
use App\Http\Controllers\Controller;
6-
use Illuminate\Http\Request;
6+
use Illuminate\Http\Response;
77
use Illuminate\Support\Facades\Cookie;
8+
use Illuminate\View\View;
89

910
class AdminController extends Controller
1011
{
1112
/**
12-
* Handle the incoming request.
13+
* Handle the admin index page.
1314
*
14-
* @param \Illuminate\Http\Request $request
15-
* @return \Illuminate\Http\Response
15+
* @return \Illuminate\View\View
1616
*/
17-
public function index(Request $request)
17+
public function index(): View
1818
{
1919
return view('admin.index');
2020
}
2121

22-
public function filesManager()
22+
/**
23+
* Handle the file manager page.
24+
*
25+
* @return \Illuminate\View\View
26+
*/
27+
public function filesManager(): View
2328
{
2429
return view('admin.files-manager');
2530
}
2631

27-
public function setLang($lang)
32+
/**
33+
* Handle the change lang method
34+
*
35+
* @return \Illuminate\Http\RedirectResponse
36+
*/
37+
public function setLang(string $lang)
2838
{
2939
Cookie::queue('lang', $lang);
3040
return redirect()->back();

‎app/Http/Controllers/Admin/CategoriesController.php‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Illuminate\Http\Request;
1414
use Illuminate\Support\Facades\DB;
1515
use Illuminate\Support\Facades\Log;
16+
use Illuminate\View\View;
1617

1718
class CategoriesController extends Controller
1819
{
@@ -22,9 +23,9 @@ class CategoriesController extends Controller
2223
* Display a listing of the resource.
2324
*
2425
* @param \Illuminate\Http\Request $request
25-
* @return \Illuminate\Http\Response
26+
* @return \Illuminate\View\View
2627
*/
27-
public function index(Request $request)
28+
public function index(Request $request): View
2829
{
2930
$categories = Category::with('content')->search($request->q)->paginate(config('blog.pagination'))->withQueryString();
3031
return view('admin.categories.index')->with([
@@ -36,9 +37,9 @@ public function index(Request $request)
3637
/**
3738
* Show the form for creating a new resource.
3839
*
39-
* @return \Illuminate\Http\Response
40+
* @return \Illuminate\View\View
4041
*/
41-
public function create()
42+
public function create(): View
4243
{
4344
return view('admin.categories.save');
4445
}
@@ -47,7 +48,7 @@ public function create()
4748
* Store a newly created resource in storage.
4849
*
4950
* @param \App\Requests\CategoryStoreRequest $request
50-
* @return \Illuminate\Http\Response
51+
* @return \Illuminate\Http\RedirectResponse
5152
*/
5253
public function store(CategoryStoreRequest $request)
5354
{
@@ -78,9 +79,9 @@ public function store(CategoryStoreRequest $request)
7879
* Show the form for editing the specified resource.
7980
*
8081
* @param \App\Models\Category $category
81-
* @return \Illuminate\Http\Response
82+
* @return \Illuminate\View\View
8283
*/
83-
public function edit(Category $category)
84+
public function edit(Category $category): View
8485
{
8586
return view('admin.categories.save')->with([
8687
'category' => $category,
@@ -93,7 +94,7 @@ public function edit(Category $category)
9394
*
9495
* @param \App\Requests\CategoryStoreRequest $request
9596
* @param \App\Models\Category $category
96-
* @return \Illuminate\Http\Response
97+
* @return \Illuminate\Http\RedirectResponse
9798
*/
9899
public function update(CategoryStoreRequest $request, Category $category)
99100
{
@@ -135,7 +136,7 @@ public function update(CategoryStoreRequest $request, Category $category)
135136
* Remove the specified resource from storage.
136137
*
137138
* @param \App\Models\Category $category
138-
* @return \Illuminate\Http\Response
139+
* @return \Illuminate\Http\RedirectResponse
139140
*/
140141
public function destroy(Category $category)
141142
{
@@ -148,7 +149,7 @@ public function destroy(Category $category)
148149
*
149150
* @param \App\Http\Requests\ImageRequest $request
150151
* @param \App\Models\Category $category
151-
* @return \Illuminate\Http\Response
152+
* @return \Illuminate\Http\RedirectResponse
152153
*/
153154
public function updateImage(ImageRequest $request, Category $category)
154155
{
@@ -162,7 +163,7 @@ public function updateImage(ImageRequest $request, Category $category)
162163
* Remove the thumbnail from storage.
163164
*
164165
* @param \App\Models\Category $category
165-
* @return \Illuminate\Http\Response
166+
* @return \Illuminate\Http\RedirectResponse
166167
*/
167168
public function destroyImage(Category $category)
168169
{

‎app/Http/Controllers/Admin/ContentController.php‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,27 @@
77
use App\Models\Post;
88
use App\Models\PostContent;
99
use Illuminate\Support\Facades\DB;
10-
use Illuminate\Http\Request;
1110

1211
class ContentController extends Controller
1312
{
13+
/**
14+
* Delete content of category
15+
*
16+
* @param \App\Models\Content $content
17+
* @return \Illuminate\Http\RedirectResponse
18+
*/
1419
public function deleteCategoryContent(Content $content)
1520
{
1621
$content->delete();
1722
return redirect()->back()->withSuccess(__('This language data has been deleted.'));
1823
}
1924

25+
/**
26+
* Delete content of post
27+
*
28+
* @param \App\Models\PostContent $content
29+
* @return \Illuminate\Http\RedirectResponse
30+
*/
2031
public function deletePostContent(PostContent $postContent)
2132
{
2233
$result = DB::select('select post_id from contents_of_posts where content_id = ?', [$postContent->id]);

‎app/Http/Controllers/Admin/PostsController.php‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Illuminate\Support\Facades\DB;
1515
use Exception;
1616
use Illuminate\Support\Facades\Log;
17+
use Illuminate\View\View;
1718

1819
class PostsController extends Controller
1920
{
@@ -23,9 +24,9 @@ class PostsController extends Controller
2324
* Display a listing of the resource.
2425
*
2526
* @param \Illuminate\Http\Request $request
26-
* @return \Illuminate\Http\Response
27+
* @return \Illuminate\View\View
2728
*/
28-
public function index(Request $request)
29+
public function index(Request $request): View
2930
{
3031
$posts = Post::with(['author', 'categories', 'content'])->orderBy('id', 'desc')->search($request->q)->paginate(config('blog.pagination'))->withQueryString();
3132
return view('admin.posts.index')->with([
@@ -37,9 +38,9 @@ public function index(Request $request)
3738
/**
3839
* Show the form for creating a new resource.
3940
*
40-
* @return \Illuminate\Http\Response
41+
* @return \Illuminate\View\View
4142
*/
42-
public function create()
43+
public function create(): View
4344
{
4445
return view('admin.posts.save');
4546
}
@@ -48,7 +49,7 @@ public function create()
4849
* Store a newly created resource in storage.
4950
*
5051
* @param \App\Requests\PostStoreRequest $request
51-
* @return \Illuminate\Http\Response
52+
* @return \Illuminate\Http\RedirectResponse
5253
*/
5354
public function store(PostStoreRequest $request)
5455
{
@@ -81,9 +82,9 @@ public function store(PostStoreRequest $request)
8182
* Show the form for editing the specified resource.
8283
*
8384
* @param \App\Models\Post $post
84-
* @return \Illuminate\Http\Response
85+
* @return \Illuminate\View\View
8586
*/
86-
public function edit(Post $post)
87+
public function edit(Post $post): View
8788
{
8889
if ($post->user_id == auth()->user()->id || auth()->user()->hasOneOfRoles(['admin', 'mod'])){
8990
return view('admin.posts.save')->with([
@@ -99,7 +100,7 @@ public function edit(Post $post)
99100
*
100101
* @param \App\Requests\PostStoreRequest $request
101102
* @param \App\Models\Post $post
102-
* @return \Illuminate\Http\Response
103+
* @return \Illuminate\Http\RedirectResponse
103104
*/
104105
public function update(PostStoreRequest $request, Post $post)
105106
{
@@ -146,7 +147,7 @@ public function update(PostStoreRequest $request, Post $post)
146147
* Remove the specified resource from storage.
147148
*
148149
* @param \App\Models\Post $post
149-
* @return \Illuminate\Http\Response
150+
* @return \Illuminate\Http\RedirectResponse
150151
*/
151152
public function destroy(Post $post)
152153
{
@@ -162,7 +163,7 @@ public function destroy(Post $post)
162163
*
163164
* @param \App\Http\Requests\ImageRequest $request
164165
* @param \App\Models\Post $post
165-
* @return \Illuminate\Http\Response
166+
* @return \Illuminate\Http\RedirectResponse
166167
*/
167168
public function updateImage(ImageRequest $request, Post $post)
168169
{
@@ -179,7 +180,7 @@ public function updateImage(ImageRequest $request, Post $post)
179180
* Remove the thumbnail from storage.
180181
*
181182
* @param \App\Models\Post $post
182-
* @return \Illuminate\Http\Response
183+
* @return \Illuminate\Http\RedirectResponse
183184
*/
184185
public function destroyImage(Post $post)
185186
{
@@ -219,7 +220,7 @@ private function getValidatedData(PostStoreRequest $request): array
219220
* @param \App\Models\Post $post
220221
* @return void
221222
*/
222-
private function saveCategories(PostStoreRequest $request, Post $post)
223+
private function saveCategories(PostStoreRequest $request, Post $post): void
223224
{
224225
DB::table('posts_of_categories')->where('post_id', '=', $post->id)->delete();
225226
if (!empty($request->categories)){

‎app/Http/Controllers/Admin/UserPanelController.php‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,17 @@
1717
use Illuminate\Support\Facades\Hash;
1818
use Illuminate\Support\Facades\Log;
1919
use Illuminate\Validation\Rule;
20+
use Illuminate\View\View;
2021

2122
class UserPanelController extends Controller
2223
{
23-
public function index()
24+
/**
25+
* Handle the user panel view
26+
*
27+
* @param \Illuminate\Http\Request $request
28+
* @return \Illuminate\View\View
29+
*/
30+
public function index(): View
2431
{
2532
return view('admin.user-panel.index')->with([
2633
'user' => auth()->user(),
@@ -32,7 +39,7 @@ public function index()
3239
* Update the specified resource in storage.
3340
*
3441
* @param \Illuminate\Http\Request $request
35-
* @return \Illuminate\Http\Response
42+
* @return \Illuminate\Http\RedirectResponse
3643
*/
3744
public function update(Request $request)
3845
{
@@ -60,7 +67,6 @@ public function update(Request $request)
6067

6168
DB::beginTransaction();
6269
try {
63-
6470
$user->update([
6571
'email' => $request->email,
6672
'name' => $request->name,
@@ -93,7 +99,7 @@ public function update(Request $request)
9399
* Update the password resource in storage.
94100
*
95101
* @param \App\Http\Requests\UserPasswordRequest $request
96-
* @return \Illuminate\Http\Response
102+
* @return \Illuminate\Http\RedirectResponse
97103
*/
98104
public function updatePassword(UserPasswordRequest $request)
99105
{
@@ -108,7 +114,7 @@ public function updatePassword(UserPasswordRequest $request)
108114
* Changes the thumbnail in storage.
109115
*
110116
* @param \App\Http\Requests\ImageRequest $request
111-
* @return \Illuminate\Http\Response
117+
* @return \Illuminate\Http\RedirectResponse
112118
*/
113119
public function updateImage(ImageRequest $request)
114120
{
@@ -122,7 +128,7 @@ public function updateImage(ImageRequest $request)
122128
/**
123129
* Remove the thumbnail from storage.
124130
*
125-
* @return \Illuminate\Http\Response
131+
* @return \Illuminate\Http\RedirectResponse
126132
*/
127133
public function destroyImage()
128134
{

0 commit comments

Comments
 (0)