♻️ Apply code refactoring (#130)

* ♻️ Apply code refactoring

* ✏️ Fix Enterprise migration

Author: mckenziearts

app/Actions/Fortify/CreateNewUser.php

@@ -11,18 +11,10 @@
 use Illuminate\Validation\Rule;
 use Laravel\Fortify\Contracts\CreatesNewUsers;
 
-class CreateNewUser implements CreatesNewUsers
+final class CreateNewUser implements CreatesNewUsers
 {
     use PasswordValidationRules;
 
-    /**
-     * Validate and create a newly registered user.
-     *
-     * @param  array  $input<string, string>
-     * @return \App\Models\User
-     *
-     * @throws \Illuminate\Validation\ValidationException
-     */
     public function create(array $input): User
     {
         Validator::make($input, [

app/Actions/Fortify/ResetUserPassword.php

@@ -4,24 +4,16 @@
 
 namespace App\Actions\Fortify;
 
+use App\Models\User;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Laravel\Fortify\Contracts\ResetsUserPasswords;
 
-class ResetUserPassword implements ResetsUserPasswords
+final class ResetUserPassword implements ResetsUserPasswords
 {
     use PasswordValidationRules;
 
-    /**
-     * Validate and reset the user's forgotten password.
-     *
-     * @param  mixed  $user
-     * @param  array  $input<string string>
-     * @return void
-     *
-     * @throws \Illuminate\Validation\ValidationException
-     */
-    public function reset($user, array $input): void
+    public function reset(User $user, array $input): void
     {
         Validator::make($input, [
             'password' => $this->passwordRules(),

app/Actions/Fortify/UpdateUserPassword.php

@@ -9,22 +9,17 @@
 use Illuminate\Support\Facades\Validator;
 use Laravel\Fortify\Contracts\UpdatesUserPasswords;
 
-class UpdateUserPassword implements UpdatesUserPasswords
+final class UpdateUserPassword implements UpdatesUserPasswords
 {
     use PasswordValidationRules;
 
-    /**
-     *
-     * @param  User  $user
-     * @param  string[]  $input
-     */
     public function update(User $user, array $input): void
     {
         Validator::make($input, [
             'current_password' => ['required', 'string'],
             'password' => $this->passwordRules(),
-        ])->after(function ($validator) use ($user, $input) {
-            if (! isset($input['current_password']) || ! Hash::check($input['current_password'], $user->password)) {
+        ])->after(function ($validator) use ($user, $input): void {
+            if ( ! isset($input['current_password']) || ! Hash::check($input['current_password'], $user->password)) {
                 $validator->errors()->add('current_password', __('Le mot de passe fourni ne correspond pas à votre mot de passe actuel.'));
             }
         })->validateWithBag('updatePassword');

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -9,12 +9,8 @@
 use Illuminate\Validation\Rule;
 use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
 
-class UpdateUserProfileInformation implements UpdatesUserProfileInformation
+final class UpdateUserProfileInformation implements UpdatesUserProfileInformation
 {
-    /**
-     * @param  User $user
-     * @param  string[]  $input
-     */
     public function update(User $user, array $input): void
     {
         Validator::make($input, [
@@ -39,11 +35,7 @@ public function update(User $user, array $input): void
         }
     }
 
-    /**
-     * @param  mixed  $user
-     * @param  string[]  $input
-     */
-    protected function updateVerifiedUser(User $user, array $input): void
+    private function updateVerifiedUser(User $user, array $input): void
     {
         $user->forceFill([
             'name' => $input['name'],

app/Console/Commands/AssignUserRole.php

@@ -7,7 +7,7 @@
 use App\Models\User;
 use Illuminate\Console\Command;
 
-class AssignUserRole extends Command
+final class AssignUserRole extends Command
 {
     protected $signature = 'lcm:assign-user-role';
 

app/Console/Commands/Cleanup/DeleteOldUnverifiedUsers.php

@@ -8,7 +8,7 @@
 use App\Notifications\SendEMailToDeletedUser;
 use Illuminate\Console\Command;
 
-class DeleteOldUnverifiedUsers extends Command
+final class DeleteOldUnverifiedUsers extends Command
 {
     protected $signature = 'lcm:delete-old-unverified-users';
 

app/Console/Commands/CreateAdminUser.php

@@ -8,8 +8,9 @@
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Hash;
+use Exception;
 
-class CreateAdminUser extends Command
+final class CreateAdminUser extends Command
 {
     protected $signature = 'lcm:admin';
 
@@ -50,7 +51,7 @@ protected function createUser(): void
             $user = User::query()->create($userData);
 
             $user->assignRole('admin');
-        } catch (\Exception|QueryException $e) {
+        } catch (Exception|QueryException $e) {
             $this->error($e->getMessage());
         }
     }

app/Console/Commands/GenerateSitemap.php

@@ -10,7 +10,7 @@
 use Spatie\Sitemap\SitemapGenerator;
 use Spatie\Sitemap\Tags\Url;
 
-class GenerateSitemap extends Command
+final class GenerateSitemap extends Command
 {
     protected $signature = 'sitemap:generate';
 
@@ -28,9 +28,7 @@ class GenerateSitemap extends Command
     public function handle(): void
     {
         SitemapGenerator::create(config('app.url'))
-            ->shouldCrawl(function (UriInterface $url) {
-                return $this->shouldIndex($url->getPath());
-            })
+            ->shouldCrawl(fn (UriInterface $url) => $this->shouldIndex($url->getPath()))
             ->hasCrawled(function (Url $url) {
                 if ($this->shouldNotIndex($url->path())) {
                     return;

app/Console/Commands/PostArticleToTelegram.php

@@ -9,7 +9,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Notifications\AnonymousNotifiable;
 
-class PostArticleToTelegram extends Command
+final class PostArticleToTelegram extends Command
 {
     protected $signature = 'lcm:post-article-to-telegram';
 

app/Console/Commands/PostArticleToTwitter.php

@@ -9,7 +9,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Notifications\AnonymousNotifiable;
 
-class PostArticleToTwitter extends Command
+final class PostArticleToTwitter extends Command
 {
     protected $signature = 'lcm:post-article-to-twitter';