Merge pull request #62 from dcblogdev/fix-phpstan-errors

Fix phpstan errors

Author: dcblogdev

app/Http/Controllers/Admin/UploadController.php

@@ -29,10 +29,6 @@ public function __invoke(Request $request): JsonResponse
 
             $file = $request->file('upload');
 
-            if (is_array($file)) {
-                $file = $file[0];
-            }
-
             if (! $file instanceof UploadedFile) {
                 return response()->json(['error' => 'Invalid upload'], 400);
             }

app/Livewire/Admin/AuditTrails.php

@@ -73,7 +73,7 @@ public function sortBy(string $field): void
     }
 
     /**
-     * @return LengthAwarePaginator<AuditTrail>
+     * @return LengthAwarePaginator<int, AuditTrail>
      */
     public function userLogs(): LengthAwarePaginator
     {

app/Livewire/Admin/Roles/Roles.php

@@ -47,7 +47,7 @@ public function sortBy(string $field): void
     }
 
     /**
-     * @return LengthAwarePaginator<Role>
+     * @return LengthAwarePaginator<int, Role>
      */
     public function roles(): LengthAwarePaginator
     {

app/Livewire/Admin/Users/Users.php

@@ -71,7 +71,7 @@ public function sortBy(string $field): void
     }
 
     /**
-     * @return LengthAwarePaginator<User>
+     * @return LengthAwarePaginator<int, User>
      */
     public function users(): LengthAwarePaginator
     {

resources/views/livewire/admin/users/edit/change-password.blade.php

@@ -10,11 +10,11 @@
             <div class="card">
                 <x-form wire:submit="update" method="put">
 
-                    <x-alert>
-                        <p class="text-white">{{ __('New password must be at least 8 characters in length') }}<br>
+                    <x-alert class="text-white">
+                        <div>{{ __('New password must be at least 8 characters in length') }}<br>
                         {{ __('at least one lowercase letter') }}<br>
                         {{ __('at least one uppercase letter') }}<br>
-                        {{ __('at least one digit') }}</p>
+                        {{ __('at least one digit') }}</div>
                     </x-alert>
 
                     <x-form.input wire:model="newPassword" type="password" :label="__('New Password')" name='newPassword' />

tests/Feature/App/Http/Controllers/Admin/UploadControllerTest.php

@@ -25,25 +25,6 @@
     Storage::disk('images')->assertExists($path);
 });
 
-test('handles valid upload when file is sent as an array', function () {
-    $file = UploadedFile::fake()->image('photo.jpg');
-
-    $mockRequest = Mockery::mock(Request::class);
-    $mockRequest->shouldReceive('validate')->andReturn(['upload' => [$file]]);
-    $mockRequest->shouldReceive('hasFile')->once()->with('upload')->andReturn(true);
-    $mockRequest->shouldReceive('file')->once()->with('upload')->andReturn([$file]);
-
-    $controller = new UploadController;
-
-    $response = $controller($mockRequest);
-
-    expect($response->getStatusCode())->toBe(200);
-    expect($response->getData(true))->toHaveKey('url');
-
-    $path = str_replace('/images/', '', $response->getData(true)['url']);
-    Storage::disk('images')->assertExists($path);
-});
-
 test('fails when no file is uploaded', function () {
     postJson(route('image-upload'), [])->assertStatus(422);
 });