Adopt Laravel type hints

gdarko · Jun 2, 2024 · 049e098 · 049e098
1 parent 5113f60
commit 049e098
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 33 deletions.
diff --git a/app/Http/Middleware/ApplyLocale.php b/app/Http/Middleware/ApplyLocale.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use Symfony\Component\HttpFoundation\Response;
 use Closure;
 use Illuminate\Http\Request;
 
@@ -12,7 +13,7 @@ class ApplyLocale
      *
      * @return mixed
      */
-    public function handle(Request $request, Closure $next)
+    public function handle(Request $request, Closure $next): Response
     {
         $locale = $request->header('X-Locale');
         if (! empty($locale)) {

diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use Symfony\Component\HttpFoundation\Response;
 use App\Providers\AppServiceProvider;
 use App\Providers\RouteServiceProvider;
 use Closure;
@@ -17,7 +18,7 @@ class RedirectIfAuthenticated
      * @param  string|null  ...$guards
      * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse|\Illuminate\Http\Response
      */
-    public function handle(Request $request, Closure $next, ...$guards)
+    public function handle(Request $request, Closure $next, string ...$guards): Response
     {
         $guards = empty($guards) ? [null] : $guards;
 

diff --git a/app/Http/Requests/DestroyUserRequest.php b/app/Http/Requests/DestroyUserRequest.php
@@ -9,7 +9,7 @@ class DestroyUserRequest extends BaseRequest
      *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
 

diff --git a/app/Http/Requests/StoreUserRequest.php b/app/Http/Requests/StoreUserRequest.php
@@ -9,7 +9,7 @@ class StoreUserRequest extends BaseRequest
      *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'first_name' => 'required|string|max:100',

diff --git a/app/Http/Requests/UpdateAvatarRequest.php b/app/Http/Requests/UpdateAvatarRequest.php
@@ -4,7 +4,7 @@
 
 class UpdateAvatarRequest extends BaseRequest
 {
-    public function rules()
+    public function rules(): array
     {
         return [
             'avatar' => 'required|image',

diff --git a/app/Http/Requests/UpdateUserRequest.php b/app/Http/Requests/UpdateUserRequest.php
@@ -9,7 +9,7 @@ class UpdateUserRequest extends BaseRequest
      *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'first_name' => 'required|string|max:100',

diff --git a/app/Http/Resources/RoleResource.php b/app/Http/Resources/RoleResource.php
@@ -12,7 +12,7 @@ class RoleResource extends JsonResource
      * @param  \Illuminate\Http\Request  $request
      * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         $data = $this->resource->toArray();
 

diff --git a/app/Http/Resources/UserBasicResource.php b/app/Http/Resources/UserBasicResource.php
@@ -12,7 +12,7 @@ class UserBasicResource extends JsonResource
      * @param  \Illuminate\Http\Request  $request
      * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
@@ -16,7 +16,7 @@ class UserResource extends JsonResource
      * @param  \Illuminate\Http\Request  $request
      * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
 
         $data = $this->resource->toArray();

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -25,7 +25,7 @@ class AppServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function register()
+    public function register(): void
     {
 
     }
@@ -35,7 +35,7 @@ public function register()
      *
      * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         //
 

diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php
@@ -18,7 +18,7 @@ class FortifyServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function register()
+    public function register(): void
     {
         $this->app->instance(LoginResponseContract::class, new LoginResponse());
     }
@@ -28,7 +28,7 @@ public function register()
      *
      * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         Fortify::createUsersUsing(CreateNewUser::class);
         Fortify::updateUserProfileInformationUsing(UpdateUserProfileInformation::class);

diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
@@ -13,7 +13,7 @@ class UserFactory extends Factory
      *
      * @return array
      */
-    public function definition()
+    public function definition(): array
     {
         return [
             'first_name' => $this->faker->firstName(),

diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -11,7 +11,7 @@
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('users', function (Blueprint $table) {
             $table->id();
@@ -31,7 +31,7 @@ public function up()
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('users');
     }

diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
@@ -11,7 +11,7 @@
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('password_resets', function (Blueprint $table) {
             $table->string('email')->index();
@@ -25,7 +25,7 @@ public function up()
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('password_resets');
     }

diff --git a/database/migrations/2014_10_12_200000_add_two_factor_columns_to_users_table.php b/database/migrations/2014_10_12_200000_add_two_factor_columns_to_users_table.php
@@ -11,7 +11,7 @@
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('users', function (Blueprint $table) {
             $table->text('two_factor_secret')
@@ -29,7 +29,7 @@ public function up()
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('users', function (Blueprint $table) {
             $table->dropColumn('two_factor_secret', 'two_factor_recovery_codes');

diff --git a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
@@ -11,7 +11,7 @@
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('failed_jobs', function (Blueprint $table) {
             $table->id();
@@ -29,7 +29,7 @@ public function up()
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('failed_jobs');
     }

diff --git a/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php b/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php
@@ -11,7 +11,7 @@
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('personal_access_tokens', function (Blueprint $table) {
             $table->id();
@@ -30,7 +30,7 @@ public function up()
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('personal_access_tokens');
     }

diff --git a/database/migrations/2022_11_18_212346_create_bouncer_tables.php b/database/migrations/2022_11_18_212346_create_bouncer_tables.php
@@ -12,7 +12,7 @@
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create(Models::table('abilities'), function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -82,7 +82,7 @@ public function up()
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop(Models::table('permissions'));
         Schema::drop(Models::table('assigned_roles'));

diff --git a/database/migrations/2024_06_02_000000_rename_password_resets_table.php b/database/migrations/2024_06_02_000000_rename_password_resets_table.php
@@ -11,7 +11,7 @@
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::rename('password_resets', 'password_reset_tokens');
     }
@@ -21,7 +21,7 @@ public function up()
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::rename('password_reset_tokens', 'password_resets');
     }

diff --git a/database/seeders/BouncerSeeder.php b/database/seeders/BouncerSeeder.php
@@ -14,7 +14,7 @@ class BouncerSeeder extends Seeder
      *
      * @return void
      */
-    public function run()
+    public function run(): void
     {
         Bouncer::allow('admin')->everything();
         Bouncer::allow('regular')->toOwn(MediaFile::class)->to(['list', 'view', 'create', 'edit', 'delete']);

diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
@@ -11,7 +11,7 @@ class DatabaseSeeder extends Seeder
      *
      * @return void
      */
-    public function run()
+    public function run(): void
     {
         $this->call([
             BouncerSeeder::class,

diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php
@@ -13,7 +13,7 @@ class UsersTableSeeder extends Seeder
      *
      * @return void
      */
-    public function run()
+    public function run(): void
     {
         $users = User::factory(1)->create(
             [

diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
@@ -12,7 +12,7 @@ class ExampleTest extends TestCase
      *
      * @return void
      */
-    public function test_the_application_returns_a_successful_response()
+    public function test_the_application_returns_a_successful_response(): void
     {
         $response = $this->get('/');
 

diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
@@ -11,7 +11,7 @@ class ExampleTest extends TestCase
      *
      * @return void
      */
-    public function test_that_true_is_true()
+    public function test_that_true_is_true(): void
     {
         $this->assertTrue(true);
     }