Merge branch 'laravel-notification-channels:master' into master

Author: goaround

.github/workflows/tests.yml

@@ -11,39 +11,48 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.0]
-        laravel: [9.*, 8.*]
+        php: [8.3, 8.2, 8.1]
+        laravel: [9.*, 10.*, 11.*]
         stability: [prefer-lowest, prefer-stable]
         include:
+          - laravel: 11.*
+            testbench: 9.*
+          - laravel: 10.*
+            testbench: 8.*
           - laravel: 9.*
-            testbench: 7.*
-          - laravel: 8.*
-            testbench: ^6.23
+            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
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Get Composer cache directory
         id: composer-cache
         run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.laravel }}-${{ matrix.testbench }}-${{ matrix.stability }}-composer
           restore-keys: |
-            ${{ runner.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-
+            ${{ runner.os }}-${{ matrix.php }}-${{ matrix.laravel }}-${{ matrix.testbench }}-${{ matrix.stability }}-composer
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: curl
-          coverage: none
+          coverage: xdebug
 
       - name: Install dependencies
         run: |

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All Notable changes to `laravel-notification-channels/webpush` will be documented in this file
 
+## 8.0.0 - 2024-03-16
+
+- Added support for Laravel 11.
+  
+## 7.1.0 - 2023-03-14
+
+- Added support for Laravel 10.
+
 ## 7.0.0 - 2022-03-29
 
 - Upgrade web-push dependency [#172](https://github.com/laravel-notification-channels/webpush/pull/172). 

README.md

@@ -53,6 +53,8 @@ php artisan webpush:vapid
 
 This command will set `VAPID_PUBLIC_KEY` and `VAPID_PRIVATE_KEY`in your `.env` file.
 
+> Note: if targeting Safari or iOS after 2023, you will need to include the `VAPID_SUBJECT` variable as well or Apple will return a `BadJwtToken` error.
+
 __These keys must be safely stored and should not change.__
 
 If you still want support for [Google Cloud Messaging](https://console.cloud.google.com), set the `GCM_KEY` and `GCM_SENDER_ID` in your `.env` file.

composer.json

@@ -12,15 +12,15 @@
         }
     ],
     "require": {
-        "php": "^8.0",
-        "illuminate/notifications": "^8.0|^9.0",
-        "illuminate/support": "^8.0|^9.0",
-        "minishlink/web-push": "^7.0"
+        "php": "^8.1",
+        "illuminate/notifications": "^9.0|^10.0|^11.0",
+        "illuminate/support": "^9.0|^10.0|^11.0",
+        "minishlink/web-push": "^9.0"
     },
     "require-dev": {
         "mockery/mockery": "~1.0",
-        "orchestra/testbench": "^6.0|^7.0",
-        "phpunit/phpunit": "^9.0"
+        "orchestra/testbench": "^7.0|^8.0|^9.0",
+        "phpunit/phpunit": "^9.5|^10.5"
     },
     "autoload": {
         "psr-4": {
@@ -47,4 +47,4 @@
     "scripts": {
         "test": "vendor/bin/phpunit"
     }
-}
+}

phpunit.xml.dist

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
     <report>
       <clover outputFile="build/logs/clover.xml"/>
       <html outputDirectory="build/coverage"/>
@@ -22,4 +19,9 @@
     <env name="DB_CONNECTION" value="sqlite"/>
     <env name="DB_DATABASE" value=":memory:"/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>