Merge remote-tracking branch 'origin/master' into contributor-master

Author: joostdebruijn

.github/workflows/tests.yml

@@ -11,23 +11,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.3, 8.2, 8.1]
-        laravel: [9.*, 10.*, 11.*]
+        php: [8.4, 8.3, 8.2]
+        laravel: ['11.*', '12.*']
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: 11.*
-            testbench: 9.*
-          - laravel: 10.*
-            testbench: 8.*
-          - laravel: 9.*
-            testbench: ^7.19
-        exclude:
-          # Laravel 11 doesn't support PHP 8.1
-          - laravel: 11.*
-            php: 8.1
-          # Laravel 9 doesn't support PHP 8.3
-          - laravel: 10.*
-            php: 8.3
+            testbench: ^9.2
+          - laravel: 12.*
+            testbench: 10.*
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.stability }}
 

.gitignore

@@ -4,3 +4,5 @@ tests/temp
 composer.phar
 composer.lock
 .phpunit.result.cache
+.phpunit.cache
+.phpstan.cache

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All Notable changes to `laravel-notification-channels/webpush` will be documented in this file
 
+## 10.0.0 - 2025-02-26
+- Adds support for Laravel 12, drops support for Laravel 9 and 10, drops support for PHP 8.1 [#208](https://github.com/laravel-notification-channels/webpush/pull/208)
+- Adds native types [#209](https://github.com/laravel-notification-channels/webpush/pull/209) - if you override functions or implement interfaces of this package, please note that you might need to change method signatures
+
+## 9.0.0 - 2024-07-10
+- Update web-push library to v9
+
 ## 8.0.0 - 2024-03-16
 
 - Added support for Laravel 11.

composer.json

@@ -9,18 +9,26 @@
             "email": "[email protected]",
             "homepage": "http://cretueusebiu.com",
             "role": "Developer"
+        },
+        {
+            "name": "Joost de Bruijn",
+            "email": "[email protected]",
+            "role": "Maintainer"
         }
     ],
     "require": {
-        "php": "^8.1",
-        "illuminate/notifications": "^9.0|^10.0|^11.0",
-        "illuminate/support": "^9.0|^10.0|^11.0",
+        "php": "^8.2",
+        "illuminate/notifications": "^11.0|^12.0",
+        "illuminate/support": "^11.0|^12.0",
         "minishlink/web-push": "^9.0"
     },
     "require-dev": {
-        "mockery/mockery": "~1.0",
-        "orchestra/testbench": "^7.0|^8.0|^9.0",
-        "phpunit/phpunit": "^9.5|^10.5"
+        "laravel/pint": "^1.21",
+        "mockery/mockery": "^1.0",
+        "orchestra/testbench": "^9.2|^10.0",
+        "larastan/larastan": "^3.1",
+        "phpunit/phpunit": "^10.5|^11.5.3",
+        "rector/rector": "^2.0"
     },
     "autoload": {
         "psr-4": {

phpstan-baseline.neon

@@ -0,0 +1,19 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Method NotificationChannels\\WebPush\\PushSubscription\:\:findByEndpoint\(\) should return static\(NotificationChannels\\WebPush\\PushSubscription\)\|null but returns NotificationChannels\\WebPush\\PushSubscription\|null\.$#'
+			identifier: return.type
+			count: 1
+			path: src/PushSubscription.php
+
+		-
+			message: '#^Method NotificationChannels\\WebPush\\Test\\User\:\:pushSubscriptions\(\) should return Illuminate\\Database\\Eloquent\\Relations\\MorphMany\<NotificationChannels\\WebPush\\PushSubscription, \$this\(NotificationChannels\\WebPush\\Test\\User\)\> but returns Illuminate\\Database\\Eloquent\\Relations\\MorphMany\<Illuminate\\Database\\Eloquent\\Model, \$this\(NotificationChannels\\WebPush\\Test\\User\)\>\.$#'
+			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

@@ -0,0 +1,14 @@
+includes:
+    - ./vendor/larastan/larastan/extension.neon
+    - ./phpstan-baseline.neon
+
+parameters:
+
+    paths:
+        - src
+        - tests
+        - migrations/create_push_subscriptions_table.php.stub
+
+    level: 6
+
+    tmpDir: .phpstan.cache

rector.php

@@ -0,0 +1,16 @@
+<?php
+
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__.'/src',
+        __DIR__.'/tests',
+    ])
+    ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
+        codingStyle: true,
+        typeDeclarations: true,
+    )
+    ->withPhpSets(php82: true);

src/Events/NotificationFailed.php

@@ -3,38 +3,21 @@
 namespace NotificationChannels\WebPush\Events;
 
 use Illuminate\Queue\SerializesModels;
+use Minishlink\WebPush\MessageSentReport;
+use NotificationChannels\WebPush\PushSubscription;
+use NotificationChannels\WebPush\WebPushMessage;
 
 class NotificationFailed
 {
     use SerializesModels;
 
-    /**
-     * @var \Minishlink\WebPush\MessageSentReport
-     */
-    public $report;
-
-    /**
-     * @var \NotificationChannels\WebPush\PushSubscription
-     */
-    public $subscription;
-
-    /**
-     * @var \NotificationChannels\WebPush\WebPushMessage
-     */
-    public $message;
-
     /**
      * Create a new event instance.
      *
-     * @param  \Minishlink\WebPush\MessageSentReport  $report
-     * @param  \NotificationChannels\WebPush\PushSubscription  $subscription
-     * @param  \NotificationChannels\WebPush\WebPushMessage  $message
      * @return void
      */
-    public function __construct($report, $subscription, $message)
+    public function __construct(public MessageSentReport $report, public PushSubscription $subscription, public WebPushMessage $message)
     {
-        $this->report = $report;
-        $this->subscription = $subscription;
-        $this->message = $message;
+        //
     }
 }

src/Events/NotificationSent.php

@@ -3,38 +3,21 @@
 namespace NotificationChannels\WebPush\Events;
 
 use Illuminate\Queue\SerializesModels;
+use Minishlink\WebPush\MessageSentReport;
+use NotificationChannels\WebPush\PushSubscription;
+use NotificationChannels\WebPush\WebPushMessage;
 
 class NotificationSent
 {
     use SerializesModels;
 
-    /**
-     * @var \Minishlink\WebPush\MessageSentReport
-     */
-    public $report;
-
-    /**
-     * @var \NotificationChannels\WebPush\PushSubscription
-     */
-    public $subscription;
-
-    /**
-     * @var \NotificationChannels\WebPush\WebPushMessage
-     */
-    public $message;
-
     /**
      * Create a new event instance.
      *
-     * @param  \Minishlink\WebPush\MessageSentReport  $report
-     * @param  \NotificationChannels\WebPush\PushSubscription  $subscription
-     * @param  \NotificationChannels\WebPush\WebPushMessage  $message
      * @return void
      */
-    public function __construct($report, $subscription, $message)
+    public function __construct(public MessageSentReport $report, public PushSubscription $subscription, public WebPushMessage $message)
     {
-        $this->report = $report;
-        $this->subscription = $subscription;
-        $this->message = $message;
+        //
     }
 }

src/HasPushSubscriptions.php

@@ -2,28 +2,25 @@
 
 namespace NotificationChannels\WebPush;
 
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
 trait HasPushSubscriptions
 {
     /**
      *  Get all of the subscriptions.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany<PushSubscription, $this>
      */
-    public function pushSubscriptions()
+    public function pushSubscriptions(): MorphMany
     {
         return $this->morphMany(config('webpush.model'), 'subscribable');
     }
 
     /**
      * Update (or create) subscription.
-     *
-     * @param  string  $endpoint
-     * @param  string|null  $key
-     * @param  string|null  $token
-     * @param  string|null  $contentEncoding
-     * @return \NotificationChannels\WebPush\PushSubscription
      */
-    public function updatePushSubscription($endpoint, $key = null, $token = null, $contentEncoding = null)
+    public function updatePushSubscription(string $endpoint, ?string $key = null, ?string $token = null, ?string $contentEncoding = null): PushSubscription
     {
         $subscription = app(config('webpush.model'))->findByEndpoint($endpoint);
 
@@ -50,23 +47,17 @@ public function updatePushSubscription($endpoint, $key = null, $token = null, $c
 
     /**
      * Determine if the model owns the given subscription.
-     *
-     * @param  \NotificationChannels\WebPush\PushSubscription  $subscription
-     * @return bool
      */
-    public function ownsPushSubscription($subscription)
+    public function ownsPushSubscription(PushSubscription $subscription): bool
     {
         return (string) $subscription->subscribable_id === (string) $this->getKey() &&
                         $subscription->subscribable_type === $this->getMorphClass();
     }
 
     /**
      * Delete subscription by endpoint.
-     *
-     * @param  string  $endpoint
-     * @return void
      */
-    public function deletePushSubscription($endpoint)
+    public function deletePushSubscription(string $endpoint): void
     {
         $this->pushSubscriptions()
             ->where('endpoint', $endpoint)
@@ -76,9 +67,9 @@ public function deletePushSubscription($endpoint)
     /**
      * Get all of the subscriptions.
      *
-     * @return \Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Database\Eloquent\Collection<array-key, \NotificationChannels\WebPush\PushSubscription>
      */
-    public function routeNotificationForWebPush()
+    public function routeNotificationForWebPush(): Collection
     {
         return $this->pushSubscriptions;
     }