refactor: declare generics

Author: joostdebruijn

phpstan-baseline.neon

@@ -11,3 +11,9 @@ parameters:
 			identifier: return.type
 			count: 1
 			path: tests/User.php
+
+		-
+			message: '#^Unable to resolve the template type TRelatedModel in call to method Illuminate\\Database\\Eloquent\\Model\:\:morphMany\(\)$#'
+			identifier: argument.templateType
+			count: 1
+			path: tests/User.php

phpstan.neon

@@ -9,6 +9,6 @@ parameters:
         - tests
         - migrations/create_push_subscriptions_table.php.stub
 
-    level: 5
+    level: 6
 
     tmpDir: .phpstan.cache

src/HasPushSubscriptions.php

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

src/PushSubscription.php

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

src/VapidKeysGenerateCommand.php

@@ -46,6 +46,8 @@ public function handle(): void
 
     /**
      * Set the keys in the environment file.
+     *
+     * @param  array{'publicKey': string, 'privateKey': string}  $keys
      */
     protected function setKeysInEnvironmentFile(array $keys): bool
     {
@@ -62,6 +64,8 @@ protected function setKeysInEnvironmentFile(array $keys): bool
 
     /**
      * Write a new environment file with the given keys.
+     *
+     * @param  array{'publicKey': string, 'privateKey': string}  $keys
      */
     protected function writeNewEnvironmentFileWith(array $keys): void
     {

src/WebPushChannel.php

@@ -14,14 +14,17 @@ class WebPushChannel
     /**
      * @return void
      */
-    public function __construct(protected WebPush $webPush, protected ReportHandlerInterface $reportHandler) {}
+    public function __construct(protected WebPush $webPush, protected ReportHandlerInterface $reportHandler)
+    {
+        //
+    }
 
     /**
      * Send the given notification.
      */
     public function send(mixed $notifiable, Notification $notification): void
     {
-        /** @var \Illuminate\Database\Eloquent\Collection $subscriptions */
+        /** @var \Illuminate\Database\Eloquent\Collection<array-key, PushSubscription> $subscriptions */
         $subscriptions = $notifiable->routeNotificationFor('WebPush', $notification);
 
         if ($subscriptions->isEmpty()) {

src/WebPushMessage.php

@@ -11,6 +11,9 @@ class WebPushMessage
 {
     protected string $title;
 
+    /**
+     * @var array<array-key, array{'title': string, 'action': string, 'icon'?: string}>
+     */
     protected array $actions = [];
 
     protected string $badge;
@@ -31,10 +34,16 @@ class WebPushMessage
 
     protected string $tag;
 
+    /**
+     * @var array<int>
+     */
     protected array $vibrate;
 
     protected mixed $data;
 
+    /**
+     * @var array<string, mixed>
+     */
     protected array $options = [];
 
     /**
@@ -168,6 +177,7 @@ public function tag(string $value): static
     /**
      * Set the notification vibration pattern.
      *
+     * @param  array<int>  $value
      * @return $this
      */
     public function vibrate(array $value): static
@@ -194,6 +204,7 @@ public function data(mixed $value): static
      *
      * @link https://github.com/web-push-libs/web-push-php#notifications-and-default-options
      *
+     * @param  array<string, mixed>  $value
      * @return $this
      */
     public function options(array $value): static
@@ -205,6 +216,8 @@ public function options(array $value): static
 
     /**
      * Get the notification options.
+     *
+     * @return array<string, mixed>
      */
     public function getOptions(): array
     {
@@ -213,6 +226,8 @@ public function getOptions(): array
 
     /**
      * Get an array representation of the message.
+     *
+     * @return array<string, mixed>
      */
     public function toArray(): array
     {

src/WebPushServiceProvider.php

@@ -40,6 +40,8 @@ public function boot(): void
 
     /**
      * Get the authentication details.
+     *
+     * @return array<string, mixed>
      */
     protected function webPushAuth(): array
     {

tests/TestCase.php

@@ -34,7 +34,7 @@ protected function getEnvironmentSetUp($app)
 
     /**
      * @param  \Illuminate\Foundation\Application  $app
-     * @return array
+     * @return array<array-key, class-string>
      */
     protected function getPackageProviders($app)
     {
@@ -61,6 +61,7 @@ protected function setUpDatabase()
     }
 
     /**
+     * @param  array<string, mixed>  $attributes
      * @return \NotificationChannels\WebPush\Test\User
      */
     public function createUser(array $attributes)