Skip to content

Commit 6338c51

Browse files
ikidnapmyselfikidnapmyself
authored
Merge pull request #79 from swinn-io/chore/phpstan-burndown-1
chore(phpstan): burn down the baseline to zero
2 parents fc48b12 + 8b62b09 commit 6338c51

88 files changed

Lines changed: 748 additions & 2728 deletions

File tree

Some content is hidden

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

‎app/Console/Kernel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Kernel extends ConsoleKernel
1010
/**
1111
* The Artisan commands provided by your application.
1212
*
13-
* @var array
13+
* @var array<int, class-string>
1414
*/
1515
protected $commands = [
1616
//

‎app/Exceptions/Handler.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Handler extends ExceptionHandler
1212
/**
1313
* A list of the exception types that are not reported.
1414
*
15-
* @var array
15+
* @var array<int, class-string<Throwable>>
1616
*/
1717
protected $dontReport = [
1818
//
@@ -21,7 +21,7 @@ class Handler extends ExceptionHandler
2121
/**
2222
* A list of the inputs that are never flashed for validation exceptions.
2323
*
24-
* @var array
24+
* @var array<int, string>
2525
*/
2626
protected $dontFlash = [
2727
'password',

‎app/Http/Controllers/ContactController.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use App\Http\Resources\ContactResource;
66
use App\Interfaces\ContactServiceInterface;
77
use App\Interfaces\UserServiceInterface;
8+
use App\Models\User;
89
use Illuminate\Contracts\Foundation\Application;
910
use Illuminate\Http\RedirectResponse;
1011
use Illuminate\Http\Request;
@@ -34,6 +35,7 @@ public function __construct(ContactServiceInterface $service, UserServiceInterfa
3435
*/
3536
public function show(string $id)
3637
{
38+
/** @var User $user */
3739
$user = Auth::user();
3840

3941
return new ContactResource(
@@ -48,6 +50,7 @@ public function show(string $id)
4850
*/
4951
public function index()
5052
{
53+
/** @var User $user */
5154
$user = Auth::user();
5255

5356
return ContactResource::collection($this->service->contacts($user));
@@ -58,6 +61,7 @@ public function index()
5861
*/
5962
public function store(string $user_id): ContactResource
6063
{
64+
/** @var User $user */
6165
$user = Auth::user();
6266
$contact = $this->userService->find($user_id);
6367

@@ -73,6 +77,7 @@ public function store(string $user_id): ContactResource
7377
*/
7478
public function redirect(Request $request, string $id)
7579
{
80+
/** @var User $user */
7681
$user = Auth::user();
7782
$contact = $this->service->contact($id, $user);
7883

@@ -82,6 +87,6 @@ public function redirect(Request $request, string $id)
8287

8388
$URI = $request->get('redirect_uri', config('app.uri'));
8489

85-
return redirect($URI ?? '/');
90+
return redirect(is_string($URI) ? $URI : '/');
8691
}
8792
}

‎app/Http/Controllers/FrontEnd/DashboardController.php‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44

55
use App\Http\Controllers\Controller;
66
use App\Interfaces\MessageServiceInterface;
7+
use App\Models\User;
78
use Illuminate\Http\Request;
8-
use Illuminate\Http\Response;
99
use Illuminate\Support\Facades\Auth;
10+
use Illuminate\View\View;
1011

1112
use function view;
1213

@@ -15,10 +16,11 @@ class DashboardController extends Controller
1516
/**
1617
* Display a listing of the resource.
1718
*
18-
* @return Response
19+
* @return View
1920
*/
2021
public function index(MessageServiceInterface $messages)
2122
{
23+
/** @var User $user */
2224
$user = Auth::user();
2325
$threads = $messages->threads($user);
2426

@@ -28,7 +30,7 @@ public function index(MessageServiceInterface $messages)
2830
'subject' => $thread->subject,
2931
'unread_count' => 0,
3032
'participants' => $thread->participants
31-
->map(fn ($participant) => ['user' => ['name' => $participant->user->name]])
33+
->map(fn ($participant) => ['user' => ['name' => $participant->user?->name]])
3234
->values()
3335
->all(),
3436
])->values()->all(),
@@ -38,7 +40,7 @@ public function index(MessageServiceInterface $messages)
3840
/**
3941
* Show the form for creating a new resource.
4042
*
41-
* @return Response
43+
* @return void
4244
*/
4345
public function create()
4446
{
@@ -48,7 +50,7 @@ public function create()
4850
/**
4951
* Store a newly created resource in storage.
5052
*
51-
* @return Response
53+
* @return void
5254
*/
5355
public function store(Request $request)
5456
{
@@ -59,7 +61,7 @@ public function store(Request $request)
5961
* Display the specified resource.
6062
*
6163
* @param int $id
62-
* @return Response
64+
* @return void
6365
*/
6466
public function show($id)
6567
{
@@ -70,7 +72,7 @@ public function show($id)
7072
* Show the form for editing the specified resource.
7173
*
7274
* @param int $id
73-
* @return Response
75+
* @return void
7476
*/
7577
public function edit($id)
7678
{
@@ -81,7 +83,7 @@ public function edit($id)
8183
* Update the specified resource in storage.
8284
*
8385
* @param int $id
84-
* @return Response
86+
* @return void
8587
*/
8688
public function update(Request $request, $id)
8789
{
@@ -92,7 +94,7 @@ public function update(Request $request, $id)
9294
* Remove the specified resource from storage.
9395
*
9496
* @param int $id
95-
* @return Response
97+
* @return void
9698
*/
9799
public function destroy($id)
98100
{

‎app/Http/Controllers/FrontEnd/PageController.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
use App\Http\Controllers\Controller;
66
use Illuminate\Http\Request;
7-
use Illuminate\Http\Response;
7+
use Illuminate\View\View;
88

99
class PageController extends Controller
1010
{
1111
/**
1212
* Display a listing of the resource.
1313
*
14-
* @return Response
14+
* @return View
1515
*/
1616
public function index()
1717
{
@@ -21,7 +21,7 @@ public function index()
2121
/**
2222
* Show the form for creating a new resource.
2323
*
24-
* @return Response
24+
* @return void
2525
*/
2626
public function create()
2727
{
@@ -31,7 +31,7 @@ public function create()
3131
/**
3232
* Store a newly created resource in storage.
3333
*
34-
* @return Response
34+
* @return void
3535
*/
3636
public function store(Request $request)
3737
{
@@ -42,7 +42,7 @@ public function store(Request $request)
4242
* Display the specified resource.
4343
*
4444
* @param int $id
45-
* @return Response
45+
* @return void
4646
*/
4747
public function show($id)
4848
{
@@ -53,7 +53,7 @@ public function show($id)
5353
* Show the form for editing the specified resource.
5454
*
5555
* @param int $id
56-
* @return Response
56+
* @return void
5757
*/
5858
public function edit($id)
5959
{
@@ -64,7 +64,7 @@ public function edit($id)
6464
* Update the specified resource in storage.
6565
*
6666
* @param int $id
67-
* @return Response
67+
* @return void
6868
*/
6969
public function update(Request $request, $id)
7070
{
@@ -75,7 +75,7 @@ public function update(Request $request, $id)
7575
* Remove the specified resource from storage.
7676
*
7777
* @param int $id
78-
* @return Response
78+
* @return void
7979
*/
8080
public function destroy($id)
8181
{

‎app/Http/Controllers/FrontEnd/ThreadController.php‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
use App\Http\Controllers\Controller;
66
use App\Interfaces\MessageServiceInterface;
7+
use App\Models\Message;
78
use Illuminate\Http\Request;
8-
use Illuminate\Http\Response;
9+
use Illuminate\View\View;
910

1011
class ThreadController extends Controller
1112
{
@@ -19,7 +20,7 @@ public function __construct(MessageServiceInterface $service)
1920
/**
2021
* Display a listing of the resource.
2122
*
22-
* @return Response
23+
* @return void
2324
*/
2425
public function index()
2526
{
@@ -29,7 +30,7 @@ public function index()
2930
/**
3031
* Show the form for creating a new resource.
3132
*
32-
* @return Response
33+
* @return void
3334
*/
3435
public function create()
3536
{
@@ -39,7 +40,7 @@ public function create()
3940
/**
4041
* Store a newly created resource in storage.
4142
*
42-
* @return Response
43+
* @return void
4344
*/
4445
public function store(Request $request)
4546
{
@@ -49,7 +50,7 @@ public function store(Request $request)
4950
/**
5051
* Display the specified resource.
5152
*
52-
* @return Response
53+
* @return View
5354
*/
5455
public function show(string $thread)
5556
{
@@ -59,11 +60,11 @@ public function show(string $thread)
5960
'thread' => [
6061
'id' => $thread->id,
6162
'subject' => $thread->subject,
62-
'messages' => $thread->messages->map(fn ($message) => [
63+
'messages' => $thread->messages->map(fn (Message $message) => [
6364
'id' => $message->id,
6465
'body' => $message->body,
65-
'created_at' => $message->created_at->diffForHumans(),
66-
'user' => ['name' => $message->user->name],
66+
'created_at' => $message->created_at?->diffForHumans(),
67+
'user' => ['name' => $message->user?->name],
6768
])->values()->all(),
6869
],
6970
]);
@@ -73,7 +74,7 @@ public function show(string $thread)
7374
* Show the form for editing the specified resource.
7475
*
7576
* @param int $id
76-
* @return Response
77+
* @return void
7778
*/
7879
public function edit($id)
7980
{
@@ -84,7 +85,7 @@ public function edit($id)
8485
* Update the specified resource in storage.
8586
*
8687
* @param int $id
87-
* @return Response
88+
* @return void
8889
*/
8990
public function update(Request $request, $id)
9091
{
@@ -95,7 +96,7 @@ public function update(Request $request, $id)
9596
* Remove the specified resource from storage.
9697
*
9798
* @param int $id
98-
* @return Response
99+
* @return void
99100
*/
100101
public function destroy($id)
101102
{

‎app/Http/Controllers/LoginController.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ public function home(Request $request)
5151
public function redirect(string $provider, Request $request)
5252
{
5353
try {
54-
$client = collect($request->session()->get('client'));
54+
/** @var array<string, mixed> $sessionClient */
55+
$sessionClient = $request->session()->get('client', []);
56+
$client = collect($sessionClient);
5557
if ($client->has('state') && $client->has('redirect_uri')) {
5658
$request->session()->reflash();
5759
} else {
@@ -71,9 +73,11 @@ public function redirect(string $provider, Request $request)
7173
*/
7274
public function callback(string $provider, Request $request)
7375
{
76+
/** @var array<string, mixed> $client */
7477
$client = $request->session()->get('client', []);
7578
$user = $this->service->callback($provider, $client);
7679
$URI = Arr::get($client, 'redirect_uri', false);
80+
$URI = is_string($URI) ? $URI : false;
7781

7882
/**
7983
* Authorize user before redirection, it's required for PKCE

‎app/Http/Controllers/MessageController.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
use App\Http\Resources\MessageResource;
88
use App\Http\Resources\ThreadResource;
99
use App\Interfaces\MessageServiceInterface;
10+
use App\Models\User;
1011
use Illuminate\Http\Request;
1112
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
12-
use Illuminate\Support\Arr;
1313

1414
class MessageController extends Controller
1515
{
@@ -30,6 +30,7 @@ public function __construct(MessageServiceInterface $service)
3030
*/
3131
public function index(Request $request)
3232
{
33+
/** @var User $user */
3334
$user = $request->user();
3435
$threads = $this->service->threads($user);
3536

@@ -41,13 +42,15 @@ public function index(Request $request)
4142
*/
4243
public function store(MessageStoreRequest $request)
4344
{
45+
/** @var array{subject: string, content: array<string, mixed>, recipients?: array<int, string>} $values */
4446
$values = $request->validated();
47+
/** @var User $user */
4548
$user = $request->user();
4649
$thread = $this->service->newThread(
4750
$values['subject'],
4851
$user,
4952
$values['content'],
50-
Arr::get($values, 'recipients', [])
53+
$values['recipients'] ?? []
5154
);
5255

5356
return new ThreadResource($thread);
@@ -70,7 +73,9 @@ public function show(string $id)
7073
*/
7174
public function new(string $id, MessageNewRequest $request)
7275
{
76+
/** @var array{body: array<string, mixed>} $values */
7377
$values = $request->validated();
78+
/** @var User $user */
7479
$user = $request->user();
7580
$thread = $this->service->thread($id);
7681
$message = $this->service->newMessage(

0 commit comments

Comments
 (0)