refactor: rector, pint and phpstan issues

Author: joostdebruijn

config/webpush.php

@@ -1,5 +1,7 @@
 <?php
 
+use NotificationChannels\WebPush\PushSubscription;
+
 return [
 
     /**
@@ -16,7 +18,7 @@
     /**
      * This is model that will be used to for push subscriptions.
      */
-    'model' => \NotificationChannels\WebPush\PushSubscription::class,
+    'model' => PushSubscription::class,
 
     /**
      * This is the name of the table that will be created by the migration and

src/DeclarativeWebPushMessage.php

@@ -6,8 +6,6 @@
 use NotificationChannels\WebPush\Exceptions\MessageValidationFailed;
 
 /**
- * @implements \Illuminate\Contracts\Support\Arrayable<string, mixed>
- *
  * @link https://www.w3.org/TR/push-api/#members
  */
 class DeclarativeWebPushMessage implements WebPushMessageInterface

src/Events/NotificationFailed.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace NotificationChannels\WebPush\Events;
 
 use Illuminate\Queue\SerializesModels;
@@ -13,8 +15,6 @@ class NotificationFailed
 
     /**
      * Create a new event instance.
-     *
-     * @return void
      */
     public function __construct(public MessageSentReport $report, public PushSubscription $subscription, public WebPushMessageInterface $message)
     {

src/Events/NotificationSent.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace NotificationChannels\WebPush\Events;
 
 use Illuminate\Queue\SerializesModels;
@@ -13,8 +15,6 @@ class NotificationSent
 
     /**
      * Create a new event instance.
-     *
-     * @return void
      */
     public function __construct(public MessageSentReport $report, public PushSubscription $subscription, public WebPushMessageInterface $message)
     {

src/Exceptions/MessageValidationFailed.php

@@ -2,15 +2,15 @@
 
 namespace NotificationChannels\WebPush\Exceptions;
 
-class MessageValidationFailed extends \Exception
+final class MessageValidationFailed extends \Exception
 {
-    public static function titleRequired(): static
+    public static function titleRequired(): self
     {
-        return new static('"title" must be set for Declarative Web Push messages');
+        return new self('"title" must be set for Declarative Web Push messages');
     }
 
-    public static function navigateRequired(): static
+    public static function navigateRequired(): self
     {
-        return new static('"navigate" must be set for Declarative Web Push messages');
+        return new self('"navigate" must be set for Declarative Web Push messages');
     }
 }

src/HasPushSubscriptions.php

@@ -10,7 +10,7 @@ trait HasPushSubscriptions
     /**
      *  Get all of the subscriptions.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany<PushSubscription, $this>
+     * @return MorphMany<PushSubscription, $this>
      */
     public function pushSubscriptions(): MorphMany
     {
@@ -67,7 +67,7 @@ public function deletePushSubscription(string $endpoint): void
     /**
      * Get all of the subscriptions.
      *
-     * @return \Illuminate\Database\Eloquent\Collection<array-key, \NotificationChannels\WebPush\PushSubscription>
+     * @return Collection<array-key, PushSubscription>
      */
     public function routeNotificationForWebPush(): Collection
     {

src/PushSubscription.php

@@ -34,7 +34,6 @@ class PushSubscription extends Model
      * Create a new model instance.
      *
      * @param  array<string, mixed>  $attributes
-     * @return void
      */
     public function __construct(array $attributes = [])
     {
@@ -52,7 +51,7 @@ public function __construct(array $attributes = [])
     /**
      * Get the model related to the subscription.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo<\Illuminate\Database\Eloquent\Model, $this>
+     * @return MorphTo<Model, $this>
      */
     public function subscribable(): MorphTo
     {

src/ReportHandler.php

@@ -1,7 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace NotificationChannels\WebPush;
 
+use Illuminate\Contracts\Events\Dispatcher;
 use Minishlink\WebPush\MessageSentReport;
 use NotificationChannels\WebPush\Events\NotificationFailed;
 use NotificationChannels\WebPush\Events\NotificationSent;
@@ -10,10 +13,8 @@ class ReportHandler implements ReportHandlerInterface
 {
     /**
      * Create a new report handler.
-     *
-     * @return void
      */
-    public function __construct(protected \Illuminate\Contracts\Events\Dispatcher $events)
+    public function __construct(protected Dispatcher $events)
     {
         //
     }

src/ReportHandlerInterface.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace NotificationChannels\WebPush;
 
 use Minishlink\WebPush\MessageSentReport;

src/WebPushChannel.php

@@ -12,9 +12,6 @@
 
 class WebPushChannel
 {
-    /**
-     * @return void
-     */
     public function __construct(protected WebPush $webPush, protected ReportHandlerInterface $reportHandler)
     {
         //
@@ -25,20 +22,20 @@ public function __construct(protected WebPush $webPush, protected ReportHandlerI
      */
     public function send(mixed $notifiable, Notification $notification): void
     {
-        /** @var \Illuminate\Database\Eloquent\Collection<array-key, PushSubscription> $subscriptions */
+        /** @var Collection<array-key, PushSubscription> $subscriptions */
         $subscriptions = $notifiable->routeNotificationFor('WebPush', $notification);
 
         if ($subscriptions->isEmpty()) {
             return;
         }
 
-        /** @var \NotificationChannels\WebPush\WebPushMessageInterface $message */
+        /** @var WebPushMessageInterface $message */
         // @phpstan-ignore-next-line
         $message = $notification->toWebPush($notifiable, $notification);
         $payload = json_encode($message->toArray());
         $options = $message->getOptions();
 
-        /** @var \NotificationChannels\WebPush\PushSubscription $subscription */
+        /** @var PushSubscription $subscription */
         foreach ($subscriptions as $subscription) {
             $this->webPush->queueNotification(new Subscription(
                 $subscription->endpoint,
@@ -56,12 +53,12 @@ public function send(mixed $notifiable, Notification $notification): void
     /**
      * Handle the reports.
      *
-     * @param  \Illuminate\Database\Eloquent\Collection<array-key, PushSubscription>  $subscriptions
+     * @param  Collection<array-key, PushSubscription>  $subscriptions
      */
     protected function handleReports(Generator $reports, Collection $subscriptions, WebPushMessageInterface $message): void
     {
         foreach ($reports as $report) {
-            /** @var \Minishlink\WebPush\MessageSentReport $report */
+            /** @var MessageSentReport $report */
             $subscription = $this->findSubscription($subscriptions, $report);
 
             if (filled($subscription)) {
@@ -71,7 +68,7 @@ protected function handleReports(Generator $reports, Collection $subscriptions,
     }
 
     /**
-     * @param  \Illuminate\Database\Eloquent\Collection<array-key, PushSubscription>  $subscriptions
+     * @param  Collection<array-key, PushSubscription>  $subscriptions
      */
     protected function findSubscription(Collection $subscriptions, MessageSentReport $report): ?PushSubscription
     {