formatting, juiste use voor UpdateDynamicRequest

app/Events/MutationCreated.php

@@ -30,6 +30,7 @@ class MutationCreated implements ShouldBroadcast
     public function broadcastOn(): array
     {
         $chatId = $this->mutation->ledger->dynamic->chat->id;
+
         return [
             new PrivateChannel('chats.'.$chatId),
         ];

app/Events/MutationUpdated.php

@@ -30,6 +30,7 @@ class MutationUpdated implements ShouldBroadcast
     public function broadcastOn(): array
     {
         $chatId = $this->mutation->ledger->dynamic->chat->id;
+
         return [
             new PrivateChannel('chats.'.$chatId),
         ];

app/Http/Controllers/DynamicController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Http\Requests\UpdateDynamicRequest;
 use App\Http\Resources\DynamicResource;
 use App\Http\Resources\LedgerResource;
 use App\Http\Resources\MessageResource;
@@ -15,6 +16,7 @@ use Inertia\Inertia;
 class DynamicController extends Controller
 {
     use AuthorizesRequests;
+
     /**
      * Display a listing of the resource.
      */

app/Http/Controllers/DynamicInvitationController.php

@@ -5,16 +5,18 @@ namespace App\Http\Controllers;
 use App\Mail\DynamicInvitationMail;
 use App\Models\Dynamic;
 use App\Models\DynamicInvitation;
+use App\Models\User;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
 use Inertia\Inertia;
 
 class DynamicInvitationController extends Controller
 {
     use AuthorizesRequests;
+
     /**
      * Show the form for creating a new invitation.
      */
@@ -39,7 +41,7 @@ class DynamicInvitationController extends Controller
             ->where('role', 'owner')
             ->exists();
 
-        if (!$isOwner) {
+        if (! $isOwner) {
             abort(403, 'Only dynamic owners can invite other users.');
         }
 
@@ -92,7 +94,7 @@ class DynamicInvitationController extends Controller
     public function accept(Request $request, string $token)
     {
         // Must be signed!
-        if (!$request->hasValidSignature()) {
+        if (! $request->hasValidSignature()) {
             abort(401, 'Invalid or expired signature.');
         }
 
@@ -116,9 +118,9 @@ class DynamicInvitationController extends Controller
             // Log to Dynamic chat activity log!
             $dynamic->chat->messages()->create([
                 'user_id' => null,
-                'content' => "<user:{$request->user()->id}> joined the Dynamic as a " . strtoupper($invitation->role),
+                'content' => "<user:{$request->user()->id}> joined the Dynamic as a ".strtoupper($invitation->role),
                 'subject_id' => $request->user()->id,
-                'subject_type' => \App\Models\User::class,
+                'subject_type' => User::class,
             ]);
 
             // Delete the invitation record

app/Http/Controllers/LedgerController.php

@@ -11,8 +11,8 @@ use App\Http\Resources\UserResource;
 use App\Models\Dynamic;
 use App\Models\Ledger;
 use App\Services\ActivityService;
-use Illuminate\Http\Request;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Http\Request;
 use Inertia\Inertia;
 
 class LedgerController extends Controller

app/Http/Controllers/MutationController.php

@@ -2,14 +2,17 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Resources\MutationResource;
+use App\Events\MessageSent;
+use App\Events\MutationCreated;
+use App\Events\MutationUpdated;
 use App\Http\Requests\StoreMutationRequest;
+use App\Http\Resources\MutationResource;
 use App\Models\Dynamic;
 use App\Models\Ledger;
 use App\Models\Mutation;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
 class MutationController extends Controller
 {
@@ -69,7 +72,7 @@ class MutationController extends Controller
         });
 
         // Broadcast the real-time creation event!
-        broadcast(new \App\Events\MutationCreated($mutation));
+        broadcast(new MutationCreated($mutation));
 
         return redirect()->route('dynamics.ledgers.show', [$dynamic, $ledger]);
     }
@@ -80,7 +83,7 @@ class MutationController extends Controller
     public function show(Dynamic $dynamic, Ledger $ledger, Mutation $mutation)
     {
         $this->authorize('view', $mutation);
-        
+
         return new MutationResource($mutation);
     }
 
@@ -127,12 +130,12 @@ class MutationController extends Controller
             'subject_id' => $mutation->id,
             'subject_type' => Mutation::class,
         ]);
-        broadcast(new \App\Events\MessageSent($mutationMsg));
+        broadcast(new MessageSent($mutationMsg));
 
         if ($newStatus === 'approved') {
             $dynamicMsg = $dynamic->chat->messages()->create([
                 'user_id' => null,
-                'content' => "<user:{$user->id}> APPROVED the suggestion \"{$mutation->description}\" for " . ($mutation->amount >= 0 ? '+' : '') . "{$mutation->amount} points on \"{$ledger->name}\" ledger.",
+                'content' => "<user:{$user->id}> APPROVED the suggestion \"{$mutation->description}\" for ".($mutation->amount >= 0 ? '+' : '')."{$mutation->amount} points on \"{$ledger->name}\" ledger.",
                 'subject_id' => $mutation->id,
                 'subject_type' => Mutation::class,
             ]);
@@ -144,10 +147,10 @@ class MutationController extends Controller
                 'subject_type' => Mutation::class,
             ]);
         }
-        broadcast(new \App\Events\MessageSent($dynamicMsg));
+        broadcast(new MessageSent($dynamicMsg));
 
         // Broadcast the real-time update event!
-        broadcast(new \App\Events\MutationUpdated($mutation));
+        broadcast(new MutationUpdated($mutation));
 
         return redirect()->back();
     }

app/Http/Controllers/ParticipantController.php

@@ -30,14 +30,14 @@ class ParticipantController extends Controller
     public function show(Request $request, Dynamic $dynamic, User $user)
     {
         // Ensure both the authenticated user and the target user are in the dynamic
-        if (!$dynamic->participants()->where('user_id', $request->user()->id)->exists()) {
+        if (! $dynamic->participants()->where('user_id', $request->user()->id)->exists()) {
             abort(403);
         }
 
         $participant = $dynamic->participants()->where('user_id', $user->id)->firstOrFail();
 
         $mutations = $user->mutations()
-            ->whereHas('ledger', fn($query) => $query->where('dynamic_id', $dynamic->id))
+            ->whereHas('ledger', fn ($query) => $query->where('dynamic_id', $dynamic->id))
             ->with('ledger')
             ->latest('id')
             ->take(10)
@@ -54,5 +54,4 @@ class ParticipantController extends Controller
             'mutations' => $mutations,
         ]);
     }
-
 }

app/Http/Controllers/PredefinedMutationController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Models\Dynamic;
-use App\Models\Ledger;
 use App\Models\PredefinedMutation;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Http\Request;

app/Http/Middleware/HandleInertiaRequests.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Services\ActivityService;
 use Illuminate\Http\Request;
 use Inertia\Middleware;
 
@@ -46,8 +47,9 @@ class HandleInertiaRequests extends Middleware
                 if (! $request->user()) {
                     return 0;
                 }
-                
-                $service = app(\App\Services\ActivityService::class);
+
+                $service = app(ActivityService::class);
+
                 return count($service->getUnreadDynamicsGrouped($request->user()));
             },
         ];

app/Http/Requests/UpdateDynamicRequest.php

@@ -5,8 +5,6 @@ namespace App\Http\Requests;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
 
-use App\Models\Dynamic;
-
 class UpdateDynamicRequest extends FormRequest
 {
     /**
@@ -22,7 +20,7 @@ class UpdateDynamicRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array|string>
+     * @return array<string, ValidationRule|array|string>
      */
     public function rules(): array
     {

app/Http/Resources/BaseResource.php

@@ -2,9 +2,8 @@
 
 namespace App\Http\Resources;
 
-use Illuminate\Http\Resources\Json\JsonResource;
-
 use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
 
 class BaseResource extends JsonResource
 {

app/Http/Resources/DynamicResource.php

@@ -3,7 +3,6 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
 
 class DynamicResource extends BaseResource
 {

app/Http/Resources/LedgerResource.php

@@ -3,7 +3,6 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
 
 class LedgerResource extends BaseResource
 {

app/Http/Resources/MutationResource.php

@@ -3,7 +3,6 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
 
 class MutationResource extends BaseResource
 {

app/Http/Resources/PredefinedMutationResource.php

@@ -3,7 +3,6 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
 
 class PredefinedMutationResource extends BaseResource
 {

app/Http/Resources/UserResource.php

@@ -3,7 +3,6 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
 
 class UserResource extends BaseResource
 {

app/Mail/DynamicInvitationMail.php

@@ -10,20 +10,24 @@ use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\URL;
 
-class DynamicInvitationMail extends Mailable {
+class DynamicInvitationMail extends Mailable
+{
     use Queueable, SerializesModels;
 
-    public function __construct(public DynamicInvitation $invitation, public string $inviterName) {
+    public function __construct(public DynamicInvitation $invitation, public string $inviterName)
+    {
         //
     }
 
-    public function envelope(): Envelope {
+    public function envelope(): Envelope
+    {
         return new Envelope(
-            subject: 'Invitation to Join Dynamic: ' . $this->invitation->dynamic->name,
+            subject: 'Invitation to Join Dynamic: '.$this->invitation->dynamic->name,
         );
     }
 
-    public function content(): Content {
+    public function content(): Content
+    {
         $acceptUrl = URL::temporarySignedRoute(
             'dynamics.invitations.accept',
             $this->invitation->expires_at,

app/Models/Dynamic.php

@@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
+use Illuminate\Support\Str;
 
 class Dynamic extends Model
 {
@@ -47,7 +48,7 @@ class Dynamic extends Model
     protected static function booted(): void
     {
         static::creating(function ($model) {
-            $model->uuid = (string) \Illuminate\Support\Str::uuid();
+            $model->uuid = (string) Str::uuid();
         });
 
         static::created(function (Dynamic $dynamic) {

app/Models/DynamicInvitation.php

@@ -6,7 +6,8 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-class DynamicInvitation extends Model {
+class DynamicInvitation extends Model
+{
     use HasFactory;
 
     protected $fillable = [
@@ -21,11 +22,13 @@ class DynamicInvitation extends Model {
         'expires_at' => 'datetime',
     ];
 
-    public function dynamic(): BelongsTo {
+    public function dynamic(): BelongsTo
+    {
         return $this->belongsTo(Dynamic::class);
     }
 
-    public function isExpired(): bool {
+    public function isExpired(): bool
+    {
         return $this->expires_at->isPast();
     }
 }

app/Models/Ledger.php

@@ -7,6 +7,8 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Support\Str;
 
 class Ledger extends Model
 {
@@ -37,7 +39,7 @@ class Ledger extends Model
         return $this->hasMany(PredefinedMutation::class);
     }
 
-    public function media(): \Illuminate\Database\Eloquent\Relations\MorphMany
+    public function media(): MorphMany
     {
         return $this->morphMany(Media::class, 'mediable');
     }
@@ -45,7 +47,7 @@ class Ledger extends Model
     protected static function booted(): void
     {
         static::creating(function ($model) {
-            $model->uuid = (string) \Illuminate\Support\Str::uuid();
+            $model->uuid = (string) Str::uuid();
         });
     }
 

app/Models/Media.php

@@ -6,7 +6,8 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
-class Media extends Model {
+class Media extends Model
+{
     use HasFactory;
 
     protected $fillable = [
@@ -17,11 +18,13 @@ class Media extends Model {
 
     protected $appends = ['url'];
 
-    public function mediable(): MorphTo {
+    public function mediable(): MorphTo
+    {
         return $this->morphTo();
     }
 
-    public function getUrlAttribute(): string {
-        return asset('storage/' . $this->file_path);
+    public function getUrlAttribute(): string
+    {
+        return asset('storage/'.$this->file_path);
     }
 }

app/Models/Message.php

@@ -6,7 +6,7 @@ use Database\Factories\MessageFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class Message extends Model
@@ -37,7 +37,7 @@ class Message extends Model
         return $this->morphTo();
     }
 
-    public function media(): \Illuminate\Database\Eloquent\Relations\MorphMany
+    public function media(): MorphMany
     {
         return $this->morphMany(Media::class, 'mediable');
     }

app/Models/Mutation.php

@@ -2,11 +2,14 @@
 
 namespace App\Models;
 
+use App\Events\MessageSent;
 use Database\Factories\MutationFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
+use Illuminate\Support\Str;
 
 class Mutation extends Model
 {
@@ -43,7 +46,7 @@ class Mutation extends Model
         return $this->morphOne(Chat::class, 'chatable');
     }
 
-    public function media(): \Illuminate\Database\Eloquent\Relations\MorphMany
+    public function media(): MorphMany
     {
         return $this->morphMany(Media::class, 'mediable');
     }
@@ -51,7 +54,7 @@ class Mutation extends Model
     protected static function booted(): void
     {
         static::creating(function ($model) {
-            $model->uuid = (string) \Illuminate\Support\Str::uuid();
+            $model->uuid = (string) Str::uuid();
         });
 
         static::created(function (Mutation $mutation) {
@@ -71,24 +74,24 @@ class Mutation extends Model
                 'subject_id' => $mutation->id,
                 'subject_type' => Mutation::class,
             ]);
-            broadcast(new \App\Events\MessageSent($mutationMsg));
+            broadcast(new MessageSent($mutationMsg));
 
             if ($status === 'approved') {
                 $dynamicMsg = $dynamic->chat->messages()->create([
                     'user_id' => null,
-                    'content' => "<user:{$user->id}> added entry \"{$mutation->description}\" for " . ($mutation->amount >= 0 ? '+' : '') . "{$mutation->amount} points on \"{$ledger->name}\" ledger.",
+                    'content' => "<user:{$user->id}> added entry \"{$mutation->description}\" for ".($mutation->amount >= 0 ? '+' : '')."{$mutation->amount} points on \"{$ledger->name}\" ledger.",
                     'subject_id' => $mutation->id,
                     'subject_type' => Mutation::class,
                 ]);
             } else {
                 $dynamicMsg = $dynamic->chat->messages()->create([
                     'user_id' => null,
-                    'content' => "<user:{$user->id}> suggested \"{$mutation->description}\" for " . ($mutation->amount >= 0 ? '+' : '') . "{$mutation->amount} points on \"{$ledger->name}\" ledger.",
+                    'content' => "<user:{$user->id}> suggested \"{$mutation->description}\" for ".($mutation->amount >= 0 ? '+' : '')."{$mutation->amount} points on \"{$ledger->name}\" ledger.",
                     'subject_id' => $mutation->id,
                     'subject_type' => Mutation::class,
                 ]);
             }
-            broadcast(new \App\Events\MessageSent($dynamicMsg));
+            broadcast(new MessageSent($dynamicMsg));
         });
     }
 

app/Models/PredefinedMutation.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Str;
 
 class PredefinedMutation extends Model
 {
@@ -26,7 +27,7 @@ class PredefinedMutation extends Model
     protected static function booted(): void
     {
         static::creating(function ($model) {
-            $model->uuid = (string) \Illuminate\Support\Str::uuid();
+            $model->uuid = (string) Str::uuid();
         });
     }
 

app/Models/User.php

@@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Str;
 use Laravel\Fortify\Contracts\PasskeyUser;
 use Laravel\Fortify\PasskeyAuthenticatable;
 use Laravel\Fortify\TwoFactorAuthenticatable;
@@ -33,7 +34,7 @@ use NotificationChannels\WebPush\HasPushSubscriptions;
 class User extends Authenticatable implements PasskeyUser
 {
     /** @use HasFactory<UserFactory> */
-    use HasFactory, Notifiable, PasskeyAuthenticatable, TwoFactorAuthenticatable, HasPushSubscriptions;
+    use HasFactory, HasPushSubscriptions, Notifiable, PasskeyAuthenticatable, TwoFactorAuthenticatable;
 
     public function dynamics()
     {
@@ -74,7 +75,7 @@ class User extends Authenticatable implements PasskeyUser
     protected static function booted(): void
     {
         static::creating(function ($model) {
-            $model->uuid = (string) \Illuminate\Support\Str::uuid();
+            $model->uuid = (string) Str::uuid();
         });
     }
 

app/Notifications/NewActivityNotification.php

@@ -3,10 +3,7 @@
 namespace App\Notifications;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
-
 use NotificationChannels\WebPush\WebPushChannel;
 use NotificationChannels\WebPush\WebPushMessage;
 

app/Providers/AppServiceProvider.php

@@ -3,9 +3,9 @@
 namespace App\Providers;
 
 use Carbon\CarbonImmutable;
+use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Date;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Validation\Rules\Password;
 

app/Services/ActivityService.php

@@ -2,16 +2,14 @@
 
 namespace App\Services;
 
-use App\Models\User;
 use App\Models\Dynamic;
 use App\Models\Ledger;
-use App\Models\Mutation;
 use App\Models\Message;
 use App\Models\ReadCursor;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Str;
-
+use App\Models\User;
 use App\Notifications\NewActivityNotification;
+use Carbon\CarbonInterface;
+use Illuminate\Support\Carbon;
 
 class ActivityService
 {
@@ -35,7 +33,7 @@ class ActivityService
     /**
      * Get the read cursor timestamp for a user on a specific entity.
      */
-    public function getCursorReadAt(User $user, $entity): \Carbon\CarbonInterface
+    public function getCursorReadAt(User $user, $entity): CarbonInterface
     {
         $cursor = ReadCursor::where([
             'user_id' => $user->id,
@@ -97,6 +95,7 @@ class ActivityService
         $participants = $dynamic->participants()->withPivot('display_name')->get();
         $participantsMap = $participants->reduce(function ($acc, $p) {
             $acc[$p->id] = $p->pivot->display_name ?? $p->name;
+
             return $acc;
         }, []);
 
@@ -112,6 +111,7 @@ class ActivityService
             // Resolve <user:id> placeholders to actual names/display names
             $messageData['content'] = preg_replace_callback('/<user:(\d+)>/', function ($matches) use ($participantsMap) {
                 $userId = $matches[1];
+
                 return $participantsMap[$userId] ?? "User #{$userId}";
             }, $message->content);
 
@@ -140,7 +140,7 @@ class ActivityService
     /**
      * Partition activities into read and unread, and construct the grouped entity metadata.
      */
-    private function partitionAndGroupActivities(array $activities, \Carbon\CarbonInterface $readAt, Dynamic $dynamic, array &$groupedDynamics): void
+    private function partitionAndGroupActivities(array $activities, CarbonInterface $readAt, Dynamic $dynamic, array &$groupedDynamics): void
     {
         $alreadyRead = [];
         $unread = [];
@@ -153,7 +153,7 @@ class ActivityService
             }
         }
 
-        if (!empty($unread)) {
+        if (! empty($unread)) {
             $context = array_slice($alreadyRead, 0, 2);
 
             $groupedDynamics[] = [
@@ -192,4 +192,4 @@ class ActivityService
 
         return '';
     }
-}
+}