Merge pull request #6 from codebar-ag/fix-null-carrier

Allow null Carrier

Author: StanBarrows

composer.json

@@ -28,11 +28,12 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.46",
+        "laravel/pint": "^1.14",
         "nunomaduro/collision": "^7.10",
         "orchestra/testbench": "^8.20",
         "pestphp/pest": "^2.31",
         "phpunit/phpunit": "^10.5",
-        "spatie/laravel-ray": "^1.33",
+        "spatie/laravel-ray": "^1.35",
         "vimeo/psalm": "^5.19"
     },
     "autoload": {

src/DTO/Carrier.php

@@ -2,16 +2,18 @@
 
 namespace CodebarAg\TwilioVerify\DTO;
 
+use Illuminate\Support\Arr;
+
 class Carrier
 {
     public static function fromJson(array $data): self
     {
         return new static(
-            error_code: $data['error_code'],
-            name: $data['name'],
-            mobile_country_code: $data['mobile_country_code'],
-            mobile_network_code: $data['mobile_network_code'],
-            type: $data['type'],
+            error_code: Arr::get($data, 'error_code'),
+            name: Arr::get($data, 'name'),
+            mobile_country_code: Arr::get($data, 'mobile_country_code'),
+            mobile_network_code: Arr::get($data, 'mobile_network_code'),
+            type: Arr::get($data, 'type'),
         );
     }
 

src/DTO/Lookup.php

@@ -2,12 +2,18 @@
 
 namespace CodebarAg\TwilioVerify\DTO;
 
+use Illuminate\Support\Arr;
+
 class Lookup
 {
-    public static function fromJson(array $lookup): self
+    public static function fromJson(array $lookup): ?self
     {
+        if (Arr::get($lookup, 'carrier') === null) {
+            return null;
+        }
+
         return new static(
-            carrier: Carrier::fromJson($lookup['carrier']),
+            carrier: Carrier::fromJson(Arr::get($lookup, 'carrier')),
         );
     }
 

src/DTO/SendCodeAttempt.php

@@ -3,6 +3,7 @@
 namespace CodebarAg\TwilioVerify\DTO;
 
 use Carbon\Carbon;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
@@ -12,9 +13,9 @@ public static function fromJson(array $attempts): Collection
     {
         return collect($attempts)->map(function (array $attempt) {
             return new static(
-                time: Carbon::parse($attempt['time']),
-                channel: $attempt['channel'],
-                attempt_sid: $attempt['attempt_sid'],
+                time: Carbon::parse(Arr::get($attempt, 'time')),
+                channel: Arr::get($attempt, 'channel'),
+                attempt_sid: Arr::get($attempt, 'attempt_sid'),
             );
         });
     }

src/DTO/VerificationCheck.php

@@ -3,22 +3,23 @@
 namespace CodebarAg\TwilioVerify\DTO;
 
 use Carbon\Carbon;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 
 class VerificationCheck
 {
     public static function fromJson(array $data): self
     {
         return new static(
-            sid: $data['sid'],
-            service_sid: $data['service_sid'],
-            account_sid: $data['account_sid'],
-            to: $data['to'],
-            channel: $data['channel'],
-            status: $data['status'],
-            valid: $data['valid'],
-            created_at: Carbon::parse($data['date_created']),
-            updated_at: Carbon::parse($data['date_updated']),
+            sid: Arr::get($data, 'sid'),
+            service_sid: Arr::get($data, 'service_sid'),
+            account_sid: Arr::get($data, 'account_sid'),
+            to: Arr::get($data, 'to'),
+            channel: Arr::get($data, 'channel'),
+            status: Arr::get($data, 'status'),
+            valid: Arr::get($data, 'valid'),
+            created_at: Carbon::parse(Arr::get($data, 'date_created')),
+            updated_at: Carbon::parse(Arr::get($data, 'date_updated')),
         );
     }
 

src/DTO/VerificationStart.php

@@ -3,6 +3,7 @@
 namespace CodebarAg\TwilioVerify\DTO;
 
 use Carbon\Carbon;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
@@ -14,18 +15,18 @@ class VerificationStart
     public static function fromJson(array $data): self
     {
         return new static(
-            sid: $data['sid'],
-            service_sid: $data['service_sid'],
-            account_sid: $data['account_sid'],
-            to: $data['to'],
-            channel: $data['channel'],
-            status: $data['status'],
-            valid: $data['valid'],
-            created_at: Carbon::parse($data['date_created']),
-            updated_at: Carbon::parse($data['date_updated']),
-            lookup: Lookup::fromJson($data['lookup']),
-            send_code_attempts: SendCodeAttempt::fromJson($data['send_code_attempts']),
-            url: $data['url'],
+            sid: Arr::get($data, 'sid'),
+            service_sid: Arr::get($data, 'service_sid'),
+            account_sid: Arr::get($data, 'account_sid'),
+            to: Arr::get($data, 'to'),
+            channel: Arr::get($data, 'channel'),
+            status: Arr::get($data, 'status'),
+            valid: Arr::get($data, 'valid'),
+            created_at: Carbon::parse(Arr::get($data, 'date_created')),
+            updated_at: Carbon::parse(Arr::get($data, 'date_updated')),
+            lookup: Lookup::fromJson(Arr::get($data, 'lookup')),
+            send_code_attempts: SendCodeAttempt::fromJson(Arr::get($data, 'send_code_attempts')),
+            url: Arr::get($data, 'url'),
         );
     }
 
@@ -39,7 +40,7 @@ public function __construct(
         public bool $valid,
         public Carbon $created_at,
         public Carbon $updated_at,
-        public Lookup $lookup,
+        public ?Lookup $lookup,
         public Collection $send_code_attempts,
         public string $url,
     ) {