Merge pull request #40 from YieldStudio/feat/laravel-12

feat: Adds support for Laravel 12

Author: dtangdev

.github/workflows/tests.yml

@@ -11,13 +11,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ["8.3", "8.2", "8.1"]
-        laravel: ["^11.0", "^10.0", "^9.0"]
+        php: ["8.4", "8.3", "8.2", "8.1"]
+        laravel: ["^12.0", "^11.0", "^10.0", "^9.0"]
         dependency-version: [ prefer-lowest, prefer-stable ]
         exclude:
+          - laravel: "^12.0"
+            php: "8.1"
           - laravel: "^11.0"
             php: "8.1"
         include:
+          - laravel: "^12.0"
+            testbench: 10.*
           - laravel: "^11.0"
             testbench: 9.*
           - laravel: "^10.0"
@@ -29,10 +33,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache/files
           key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

composer.json

@@ -27,17 +27,16 @@
   ],
   "require": {
     "php": "^8.1",
-    "illuminate/database": "^9.0|^10.0|^11.0",
-    "illuminate/support": "^9.0|^10.0|^11.0",
+    "illuminate/database": "^9.0|^10.0|^11.0|^12.0",
+    "illuminate/support": "^9.0|^10.0|^11.0|^12.0",
     "nesbot/carbon": ">=2.62.1"
   },
   "require-dev": {
-    "ciareis/bypass": "^1.0",
     "dg/bypass-finals": "^1.4",
     "guzzlehttp/guzzle": "^7.8",
     "laravel/pint": "^1.3",
-    "orchestra/testbench": "^7.0|^8.0|^9.0.2",
-    "pestphp/pest": "^1.21|^2.0",
+    "orchestra/testbench": "^7.0|^8.0|^9.0.2|^10.0",
+    "pestphp/pest": "^1.21|^2.0|^3.0",
     "phpunit/phpunit": "^9.4 || ^10.5 || ^11.0"
   },
   "autoload": {

database/migrations/2022_12_21_091846_add_unique_to_expo_tokens.php

@@ -6,7 +6,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class() extends Migration
+return new class extends Migration
 {
     public function up(): void
     {

src/Dto/ExpoMessage.php

@@ -47,7 +47,7 @@ final class ExpoMessage implements Arrayable, Jsonable
 
     public static function create(): ExpoMessage
     {
-        return new ExpoMessage();
+        return new ExpoMessage;
     }
 
     public function to(?array $value): self
@@ -183,7 +183,7 @@ public static function fromJson($jsonData): ExpoMessage
     {
         $data = json_decode($jsonData, true);
 
-        $expoMessage = new self();
+        $expoMessage = new self;
         foreach ($data as $key => $value) {
             if ($key === 'data') {
                 $expoMessage->jsonData($value);

src/Dto/ExpoNotification.php

@@ -14,7 +14,7 @@ final class ExpoNotification implements Arrayable
 
     public static function make(int|string $id, ExpoMessage $message): ExpoNotification
     {
-        return (new ExpoNotification())
+        return (new ExpoNotification)
             ->id($id)
             ->message($message);
     }

src/Dto/ExpoTicket.php

@@ -14,7 +14,7 @@ final class ExpoTicket implements Arrayable
 
     public static function make(int|string $id, string $token): ExpoTicket
     {
-        return (new ExpoTicket())
+        return (new ExpoTicket)
             ->id($id)
             ->token($token);
     }

src/Dto/ExpoToken.php

@@ -17,7 +17,7 @@ final class ExpoToken implements Arrayable
 
     public static function make(int|string $id, string $value, Model $owner): ExpoToken
     {
-        return (new ExpoToken())
+        return (new ExpoToken)
             ->id($id)
             ->value($value)
             ->owner($owner);

src/Events/InvalidExpoToken.php

@@ -6,7 +6,5 @@
 
 final class InvalidExpoToken
 {
-    public function __construct(public readonly string $token)
-    {
-    }
+    public function __construct(public readonly string $token) {}
 }

src/ExpoNotificationsChannel.php

@@ -13,8 +13,7 @@ final class ExpoNotificationsChannel
 {
     public function __construct(
         protected readonly ExpoNotificationsServiceInterface $expoNotificationsService,
-    ) {
-    }
+    ) {}
 
     /**
      * @throws ExpoNotificationsException

src/ExpoNotificationsService.php

@@ -54,12 +54,11 @@ public function __construct(
         ];
 
         if ($accessToken) {
-            $headers['Authorization'] = 'Bearer ' . $accessToken;
+            $headers['Authorization'] = 'Bearer '.$accessToken;
         }
 
         $this->http = Http::withHeaders($headers)->baseUrl($apiUrl);
 
-
         // https://expo.dev/blog/expo-adds-support-for-fcm-http-v1-api
         if (config('expo-notifications.service.use_fcm_legacy_api')) {
             $this->http->withQueryParameters([
@@ -107,7 +106,7 @@ public function receipts(Collection|array $tokenIds): Collection
         }
 
         return collect($data['data'])->map(function ($responseItem, $id) {
-            $data = (new PushReceiptResponse())
+            $data = (new PushReceiptResponse)
                 ->id($id)
                 ->status($responseItem['status']);
 
@@ -204,14 +203,14 @@ private function setTicketsFromData(array $data): ExpoNotificationsService
             ->each(function ($responseItem) {
                 if ($responseItem['status'] === ExpoResponseStatus::ERROR->value) {
                     $this->tickets->push(
-                        (new PushTicketResponse())
+                        (new PushTicketResponse)
                             ->status($responseItem['status'])
                             ->message($responseItem['message'])
                             ->details($responseItem['details'])
                     );
                 } else {
                     $this->tickets->push(
-                        (new PushTicketResponse())
+                        (new PushTicketResponse)
                             ->status($responseItem['status'])
                             ->ticketId($responseItem['id'])
                     );