feat: switch to Hearth Components, remove Hearth, upgrade to Laravel 11

app/Actions/Fortify/UpdateUserPassword.php

@@ -25,7 +25,7 @@ public function update($user, array $input)
             if (! isset($input['current_password']) || ! Hash::check($input['current_password'], $user->password)) {
                 $validator->errors()->add(
                     'current_password',
-                    __('hearth::auth.wrong_password')
+                    __('auth.wrong_password')
                 );
             }
         })->validateWithBag('updatePassword');

app/Console/Kernel.php

@@ -47,7 +47,5 @@ protected function schedule(Schedule $schedule)
     protected function commands()
     {
         $this->load(__DIR__.'/Commands');
-
-        require base_path('routes/console.php');
     }
 }

app/Http/Controllers/ContractorInvitationController.php

@@ -38,7 +38,7 @@ public function accept(Request $request, Invitation $invitation): RedirectRespon
         }
 
         flash(
-            __('You have joined :invitationable as a :role', ['invitationable' => $invitation->invitationable->name, 'role' => $invitation->role]),
+            __('You have joined :invitationable as a :role', ['invitationable' => $invitation->invitationable->getTranslation('name', locale()), 'role' => $invitation->role]),
             'success|'.__('You have joined as a :role', ['role' => $invitation->role], 'en')
         );
 
@@ -74,12 +74,12 @@ public function decline(Request $request, Invitation $invitation): RedirectRespo
             $invitation->type === 'individual'
                 ? __('You have declined your invitation to work as a :role on :invitationable.', [
                     'role' => $invitation->role,
-                    'invitationable' => $invitation->invitationable->name,
+                    'invitationable' => $invitation->invitationable->getTranslation('name', locale()),
                 ])
                 : __('You have declined an invitation on behalf of your organization, :organization, to work as a :role on :invitationable.', [
                     'organization' => $request->user()->organization->name,
                     'role' => $invitation->role,
-                    'invitationable' => $invitation->invitationable->name,
+                    'invitationable' => $invitation->invitationable->getTranslation('name', locale()),
                 ]),
             $invitation->type === 'individual'
                 ? 'success|'.__('You have declined your invitation to work.', [], 'en')

app/Http/Controllers/EngagementController.php

@@ -24,6 +24,7 @@
 use App\Models\AccessSupport;
 use App\Models\Engagement;
 use App\Models\Identity;
+use App\Models\Invitation;
 use App\Models\Language;
 use App\Models\MatchingStrategy;
 use App\Models\Organization;
@@ -177,6 +178,7 @@ public function criteriaSelection(Engagement $engagement): View
 
     public function updateCriteria(UpdateEngagementSelectionCriteriaRequest $request, Engagement $engagement): RedirectResponse
     {
+        /** @var MatchingStrategy */
         $matchingStrategy = $engagement->matchingStrategy;
 
         $engagementData = $request->safe()->only(['ideal_participants', 'minimum_participants']);
@@ -202,10 +204,10 @@ public function updateCriteria(UpdateEngagementSelectionCriteriaRequest $request
 
         $matchingStrategy->fill($matchingStrategyData);
 
-        $matchingStrategy->extra_attributes->intersectional = $matchingStrategyData['intersectional'];
+        $matchingStrategy->extra_attributes['intersectional'] = $matchingStrategyData['intersectional'];
 
         if ($matchingStrategyData['intersectional'] == 0) {
-            $matchingStrategy->extra_attributes->other_identity_type = $matchingStrategyData['other_identity_type'];
+            $matchingStrategy->extra_attributes['other_identity_type'] = $matchingStrategyData['other_identity_type'];
             if ($matchingStrategyData['other_identity_type'] === IdentityType::AgeBracket->value) {
                 $matchingStrategy->languages()->detach();
                 $matchingStrategy->syncMutuallyExclusiveIdentities(
@@ -438,9 +440,10 @@ public function manage(Engagement $engagement)
             }
         }
 
+        /** @var ?Invitation */
         $connectorInvitation = $engagement->invitations->where('role', 'connector')->first() ?? null;
         $connectorInvitee = null;
-        if ($connectorInvitation) {
+        if (! is_null($connectorInvitation)) {
             if ($connectorInvitation->type === 'individual') {
                 $individual = $this->retrieveUserByEmail($connectorInvitation->email)?->individual;
                 $connectorInvitee = $individual && $individual->checkStatus('published') ? $individual : null;
@@ -509,6 +512,7 @@ public function addOrganization(Request $request, Engagement $engagement): Redir
 
     public function removeOrganization(Request $request, Engagement $engagement): RedirectResponse
     {
+        /** @var Organization */
         $organization = $engagement->organization;
 
         $engagement->organization()->dissociate();
@@ -593,6 +597,7 @@ public function inviteParticipant(Request $request, Engagement $engagement): Red
         $validated['type'] = 'individual';
         $validated['role'] = 'participant';
 
+        /** @var Invitation */
         $invitation = $engagement->invitations()->create($validated);
 
         if ($user) {

app/Http/Controllers/HealthController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Foundation\Events\DiagnosingHealth;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Event;
+
+class HealthController extends Controller
+{
+    public function show(Request $request): JsonResponse
+    {
+        $status = [];
+
+        Event::dispatch(new DiagnosingHealth);
+
+        if (defined('LARAVEL_START')) {
+            $status['duration'] = round((microtime(true) - LARAVEL_START) * 1000).'ms';
+        }
+
+        return response()->json($status);
+    }
+}

app/Http/Controllers/ProjectController.php

@@ -140,9 +140,7 @@ public function update(UpdateProjectRequest $request, Project $project): Redirec
         $project->fill($data);
         $project->save();
 
-        if (isset($data['impacts'])) {
-            $project->impacts()->sync($data['impacts'] ?? []);
-        }
+        $project->impacts()->sync(isset($data['impacts']) ? $data['impacts'] : []);
 
         return $project->handleUpdateRequest($request, 1);
     }

app/Http/Controllers/SettingsController.php

@@ -118,23 +118,23 @@ public function updateAccessNeeds(UpdateAccessNeedsRequest $request): RedirectRe
             $data['other_access_need'] = null;
         }
 
-        if (! isset($data['meeting_access_needs']) || (isset($data['meeting_access_needs']) && ! in_array($signLanguageInterpretation, $data['meeting_access_needs']))) {
+        if (! isset($data['meeting_access_needs']) || ! in_array($signLanguageInterpretation, $data['meeting_access_needs'])) {
             $data['signed_language_for_interpretation'] = null;
         }
 
-        if (! isset($data['meeting_access_needs']) || (isset($data['meeting_access_needs']) && ! in_array($spokenLanguageInterpretation, $data['meeting_access_needs']))) {
+        if (! isset($data['meeting_access_needs']) || ! in_array($spokenLanguageInterpretation, $data['meeting_access_needs'])) {
             $data['spoken_language_for_interpretation'] = null;
         }
 
-        if (! isset($data['document_access_needs']) || (isset($data['document_access_needs']) && ! in_array($signLanguageTranslation, $data['document_access_needs']))) {
+        if (! isset($data['document_access_needs']) || ! in_array($signLanguageTranslation, $data['document_access_needs'])) {
             $data['signed_language_for_translation'] = null;
         }
 
-        if (! isset($data['document_access_needs']) || (isset($data['document_access_needs']) && ! in_array($writtenLanguageTranslation, $data['document_access_needs']))) {
+        if (! isset($data['document_access_needs']) || ! in_array($writtenLanguageTranslation, $data['document_access_needs'])) {
             $data['written_language_for_translation'] = null;
         }
 
-        if (! isset($data['document_access_needs']) || (isset($data['document_access_needs']) && ! in_array($printedVersion, $data['document_access_needs']))) {
+        if (! isset($data['document_access_needs']) || ! in_array($printedVersion, $data['document_access_needs'])) {
             $data['street_address'] = null;
             $data['unit_apartment_suite'] = null;
             $data['postal_code'] = null;

app/Http/Controllers/TranslationController.php

@@ -21,7 +21,7 @@ public function add(AddTranslationRequest $request)
 
         $languages = $model->languages;
         $languages[] = $data['new_language'];
-        $model->update(['languages' => array_values($languages)]);
+        $model->update(['languages' => $languages]);
 
         flash(__('Language :language added.', ['language' => get_language_exonym($data['new_language'])]), 'success|'.__('Language added.', [], 'en'));
 

app/Http/Controllers/UserController.php

@@ -205,7 +205,7 @@ public function destroy(DestroyUserRequest $request)
 
         $user->delete();
 
-        flash(__('hearth::user.destroy_succeeded'), 'success|'.__('hearth::user.destroy_succeeded', [], 'en'));
+        flash(__('user.destroy_succeeded'), 'success|'.__('user.destroy_succeeded', [], 'en'));
 
         return redirect(localized_route('welcome'));
     }

app/Http/Controllers/UserEngagementsController.php

@@ -22,22 +22,22 @@ public function show(): Response|View|RedirectResponse
 
         if ($this->isParticipant($user)) {
             $section = ProjectInvolvement::Participating->value;
-            $activeEngagements = $user->{$user->context}->engagements()->active()->get();
-            $completeEngagements = $user->{$user->context}->engagements()->complete()->get();
+            $activeEngagements = $user->{$user->context}->engagements()->active()->get() ?? [];
+            $completeEngagements = $user->{$user->context}->engagements()->complete()->get() ?? [];
         } elseif ($this->isConnector($user)) {
             $section = ProjectInvolvement::Contracted->value;
-            $activeEngagements = $user->{$user->context}->connectingEngagements()->active()->get();
-            $completeEngagements = $user->{$user->context}->connectingEngagements()->complete()->get();
+            $activeEngagements = $user->{$user->context}->connectingEngagements()->active()->get() ?? [];
+            $completeEngagements = $user->{$user->context}->connectingEngagements()->complete()->get() ?? [];
         } else {
             abort(404);
         }
 
         return view('engagements.joined', [
-            'section' => $section ?? '',
+            'section' => $section,
             'showParticipating' => $this->isParticipant($user),
             'showConnecting' => $this->isConnector($user),
-            'activeEngagements' => $activeEngagements ?? [],
-            'completeEngagements' => $completeEngagements ?? [],
+            'activeEngagements' => $activeEngagements,
+            'completeEngagements' => $completeEngagements,
         ]);
     }
 

app/Http/Controllers/VerifyEmailController.php

@@ -23,7 +23,7 @@ public function __invoke(VerifyEmailRequest $request): RedirectResponse
             event(new Verified($request->user()));
         }
 
-        flash(__('hearth::auth.verification_succeeded', [], $request->user()->locale), 'success|'.__('hearth::auth.verification_succeeded', [], 'en'));
+        flash(__('auth.verification_succeeded', [], $request->user()->locale), 'success|'.__('auth.verification_succeeded', [], 'en'));
 
         return redirect()->intended($dashboard);
     }

app/Http/Middleware/EnsureEmailIsVerified.php

@@ -3,7 +3,6 @@
 namespace App\Http\Middleware;
 
 use Closure;
-use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -17,8 +16,7 @@ class EnsureEmailIsVerified
     public function handle(Request $request, Closure $next, ?string $redirectToRoute = null): Response|RedirectResponse|null
     {
         if (! $request->user() ||
-            ($request->user() instanceof MustVerifyEmail &&
-                ! $request->user()->hasVerifiedEmail())) {
+            ! $request->user()->hasVerifiedEmail()) {
             return Redirect::guest(localized_route($redirectToRoute ?: 'verification.notice'));
         }
 

app/Http/Requests/DestroyUserRequest.php

@@ -45,7 +45,7 @@ public function withValidator(Validator $validator)
             if (! Hash::check($this->current_password, $this->user()->password)) {
                 $validator->errors()->add(
                     'current_password',
-                    __('hearth::auth.wrong_password')
+                    __('auth.wrong_password')
                 );
             }
             if ($this->user()->isOnlyAdministratorOfOrganization()) {

app/Http/Requests/MeetingRequest.php

@@ -7,12 +7,9 @@
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\Enum;
-use Worksome\RequestFactories\Concerns\HasFactory;
 
 class MeetingRequest extends FormRequest
 {
-    use HasFactory;
-
     public function authorize(): bool
     {
         return true;

app/Http/Requests/StoreEngagementRequest.php

@@ -3,12 +3,9 @@
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use Worksome\RequestFactories\Concerns\HasFactory;
 
 class StoreEngagementRequest extends FormRequest
 {
-    use HasFactory;
-
     public function authorize(): bool
     {
         return $this->user()->can('update', $this->project);

app/Http/Requests/StoreOrganizationRequest.php

@@ -5,12 +5,9 @@
 use App\Enums\OrganizationType;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rules\Enum;
-use Worksome\RequestFactories\Concerns\HasFactory;
 
 class StoreOrganizationRequest extends FormRequest
 {
-    use HasFactory;
-
     public function authorize(): bool
     {
         return true;

app/Http/Requests/StoreProjectRequest.php

@@ -4,12 +4,9 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
-use Worksome\RequestFactories\Concerns\HasFactory;
 
 class StoreProjectRequest extends FormRequest
 {
-    use HasFactory;
-
     /**
      * Determine if the user is authorized to make this request.
      *

app/Http/Requests/StoreRegulatedOrganizationRequest.php

@@ -3,12 +3,9 @@
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use Worksome\RequestFactories\Concerns\HasFactory;
 
 class StoreRegulatedOrganizationRequest extends FormRequest
 {
-    use HasFactory;
-
     public function authorize(): bool
     {
         return true;

app/Http/Requests/UpdateEngagementRequest.php

@@ -9,12 +9,9 @@
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\Enum;
-use Worksome\RequestFactories\Concerns\HasFactory;
 
 class UpdateEngagementRequest extends FormRequest
 {
-    use HasFactory;
-
     public function authorize(): bool
     {
         return $this->user()->can('update', $this->engagement);

app/Http/Requests/UpdateEngagementSelectionCriteriaRequest.php

@@ -7,12 +7,9 @@
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\Enum;
-use Worksome\RequestFactories\Concerns\HasFactory;
 
 class UpdateEngagementSelectionCriteriaRequest extends FormRequest
 {
-    use HasFactory;
-
     public function authorize(): bool
     {
         return true;

app/Http/Requests/UpdateIndividualCommunicationAndConsultationPreferencesRequest.php

@@ -9,12 +9,10 @@
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Validator;
-use Worksome\RequestFactories\Concerns\HasFactory;
 
 class UpdateIndividualCommunicationAndConsultationPreferencesRequest extends FormRequest
 {
     use ConditionallyRequireContactMethods;
-    use HasFactory;
 
     public function authorize(): bool
     {

app/Http/Requests/UpdateIndividualConstituenciesRequest.php

@@ -6,12 +6,9 @@
 use App\Enums\CommunityConnectorHasLivedExperience;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
-use Worksome\RequestFactories\Concerns\HasFactory;
 
 class UpdateIndividualConstituenciesRequest extends FormRequest
 {
-    use HasFactory;
-
     public function authorize(): bool
     {
         return true;

app/Http/Requests/UpdateIndividualRequest.php

@@ -9,12 +9,9 @@
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\Enum;
-use Worksome\RequestFactories\Concerns\HasFactory;
 
 class UpdateIndividualRequest extends FormRequest
 {
-    use HasFactory;
-
     /**
      * Determine if the user is authorized to make this request.
      */

app/Http/Requests/UpdateOrganizationConstituenciesRequest.php

@@ -6,12 +6,9 @@
 use App\Enums\StaffHaveLivedExperience;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
-use Worksome\RequestFactories\Concerns\HasFactory;
 
 class UpdateOrganizationConstituenciesRequest extends FormRequest
 {
-    use HasFactory;
-
     public function authorize(): bool
     {
         return true;