Saloon 3 (#29)

RhysLees · web-flow · commit ddf10c067cee · 2023-12-14T13:46:54.000+01:00
diff --git a/composer.json b/composer.json
@@ -26,8 +26,8 @@
         "guzzlehttp/guzzle": "^7.5",
         "illuminate/contracts": "^10.0",
         "spatie/laravel-package-tools": "^1.9.2",
-        "saloonphp/laravel-plugin": "^2.1",
-        "saloonphp/saloon": "^2.11"
+        "saloonphp/laravel-plugin": "^3.0",
+        "saloonphp/saloon": "^3.0"
     },
     "require-dev": {
         "laravel/pint": "^1.5",
diff --git a/src/DTO/Attachment.php b/src/DTO/Attachment.php
@@ -43,12 +43,12 @@ public function url(): string
     }
 
     public static function fake(
-        int $id = null,
-        int $ticketId = null,
-        int $commentId = null,
-        int $size = null,
-        string $name = null,
-        string $type = null,
+        ?int $id = null,
+        ?int $ticketId = null,
+        ?int $commentId = null,
+        ?int $size = null,
+        ?string $name = null,
+        ?string $type = null,
     ): self {
         return new self(
             id: $id ?? random_int(1, 9999),
diff --git a/src/DTO/Comment.php b/src/DTO/Comment.php
@@ -93,22 +93,22 @@ public function __construct(
     }
 
     public static function fake(
-        int $id = null,
-        int $type_id = null,
-        int $ticket_id = null,
-        int $sender_id = null,
-        string $sender = null,
-        string $subject = null,
-        string $body = null,
-        string $content_type = null,
-        string $from = null,
-        string $to = null,
-        bool $internal = null,
-        int $created_by_id = null,
-        int $updated_by_id = null,
-        int $origin_by_id = null,
-        Carbon $updated_at = null,
-        Carbon $created_at = null,
+        ?int $id = null,
+        ?int $type_id = null,
+        ?int $ticket_id = null,
+        ?int $sender_id = null,
+        ?string $sender = null,
+        ?string $subject = null,
+        ?string $body = null,
+        ?string $content_type = null,
+        ?string $from = null,
+        ?string $to = null,
+        ?bool $internal = null,
+        ?int $created_by_id = null,
+        ?int $updated_by_id = null,
+        ?int $origin_by_id = null,
+        ?Carbon $updated_at = null,
+        ?Carbon $created_at = null,
     ): self {
         return new self(
             id: $id ?? random_int(1, 1000),
diff --git a/src/DTO/ObjectAttribute.php b/src/DTO/ObjectAttribute.php
@@ -35,14 +35,14 @@ public function __construct(
     }
 
     public static function fake(
-        int $id = null,
-        int $name = null,
-        int $object_lookup_id = null,
-        string $display = null,
-        string $data_type = null,
-        int $position = null,
-        array $data_option = null,
-        array $data_option_new = null,
+        ?int $id = null,
+        ?int $name = null,
+        ?int $object_lookup_id = null,
+        ?string $display = null,
+        ?string $data_type = null,
+        ?int $position = null,
+        ?array $data_option = null,
+        ?array $data_option_new = null,
     ): self {
         return new self(
             id: $id ?? random_int(1, 1000),
@@ -61,7 +61,7 @@ public static function fakeCreateToArray(
         ?string $object = 'Ticket',
         ?string $display = 'Sample Object',
         ?bool $active = true,
-        int $position = null,
+        ?int $position = null,
         ?string $data_type = 'select',
         ?array $data_options = [
             'options' => [
diff --git a/src/DTO/Ticket.php b/src/DTO/Ticket.php
@@ -97,18 +97,18 @@ public function isInactive(): bool
     }
 
     public static function fake(
-        int $id = null,
-        int $number = null,
-        int $customer_id = null,
-        int $group_id = null,
-        int $state_id = null,
-        string $subject = null,
-        int $comments_count = null,
-        Carbon $updated_at = null,
-        Carbon $created_at = null,
-        Collection $comments = null,
-        array $properties = null,
-        array $expanded = null,
+        ?int $id = null,
+        ?int $number = null,
+        ?int $customer_id = null,
+        ?int $group_id = null,
+        ?int $state_id = null,
+        ?string $subject = null,
+        ?int $comments_count = null,
+        ?Carbon $updated_at = null,
+        ?Carbon $created_at = null,
+        ?Collection $comments = null,
+        ?array $properties = null,
+        ?array $expanded = null,
     ): self {
         return new self(
             id: $id ?? random_int(1, 1000),
diff --git a/src/DTO/User.php b/src/DTO/User.php
@@ -35,15 +35,15 @@ public function __construct(
     }
 
     public static function fake(
-        int $id = null,
-        string $first_name = null,
-        string $last_name = null,
-        string $login = null,
-        string $email = null,
-        Carbon $last_login_at = null,
-        Carbon $updated_at = null,
-        Carbon $created_at = null,
-        array $expanded = null,
+        ?int $id = null,
+        ?string $first_name = null,
+        ?string $last_name = null,
+        ?string $login = null,
+        ?string $email = null,
+        ?Carbon $last_login_at = null,
+        ?Carbon $updated_at = null,
+        ?Carbon $created_at = null,
+        ?array $expanded = null,
     ): self {
         return new self(
             id: $id ?? random_int(1, 1000),
diff --git a/src/Requests/Comments/CreateCommentRequest.php b/src/Requests/Comments/CreateCommentRequest.php
@@ -4,9 +4,9 @@
 
 use CodebarAg\Zammad\DTO\Comment;
 use Saloon\Contracts\Body\HasBody;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 use Saloon\Traits\Body\HasJsonBody;
 
 class CreateCommentRequest extends Request implements HasBody
diff --git a/src/Requests/Comments/GetCommentRequest.php b/src/Requests/Comments/GetCommentRequest.php
@@ -3,9 +3,9 @@
 namespace CodebarAg\Zammad\Requests\Comments;
 
 use CodebarAg\Zammad\DTO\Comment;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetCommentRequest extends Request
 {
diff --git a/src/Requests/ObjectAttribute/CreateObjectAttributeRequest.php b/src/Requests/ObjectAttribute/CreateObjectAttributeRequest.php
@@ -4,9 +4,9 @@
 
 use CodebarAg\Zammad\DTO\ObjectAttribute;
 use Saloon\Contracts\Body\HasBody;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 use Saloon\Traits\Body\HasJsonBody;
 
 class CreateObjectAttributeRequest extends Request implements HasBody
diff --git a/src/Requests/ObjectAttribute/GetObjectAttributeRequest.php b/src/Requests/ObjectAttribute/GetObjectAttributeRequest.php
@@ -3,9 +3,9 @@
 namespace CodebarAg\Zammad\Requests\ObjectAttribute;
 
 use CodebarAg\Zammad\DTO\ObjectAttribute;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetObjectAttributeRequest extends Request
 {
diff --git a/src/Requests/ObjectAttribute/UpdateObjectAttributeRequest.php b/src/Requests/ObjectAttribute/UpdateObjectAttributeRequest.php
@@ -4,9 +4,9 @@
 
 use CodebarAg\Zammad\DTO\ObjectAttribute;
 use Saloon\Contracts\Body\HasBody;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 use Saloon\Traits\Body\HasJsonBody;
 
 class UpdateObjectAttributeRequest extends Request implements HasBody
diff --git a/src/Requests/Tickets/CreateTicketRequest.php b/src/Requests/Tickets/CreateTicketRequest.php
@@ -4,9 +4,9 @@
 
 use CodebarAg\Zammad\DTO\Ticket;
 use Saloon\Contracts\Body\HasBody;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 use Saloon\Traits\Body\HasJsonBody;
 
 class CreateTicketRequest extends Request implements HasBody
diff --git a/src/Requests/Tickets/GetTicketRequest.php b/src/Requests/Tickets/GetTicketRequest.php
@@ -3,9 +3,9 @@
 namespace CodebarAg\Zammad\Requests\Tickets;
 
 use CodebarAg\Zammad\DTO\Ticket;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetTicketRequest extends Request
 {
diff --git a/src/Requests/Users/CreateUserRequest.php b/src/Requests/Users/CreateUserRequest.php
@@ -4,9 +4,9 @@
 
 use CodebarAg\Zammad\DTO\User;
 use Saloon\Contracts\Body\HasBody;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 use Saloon\Traits\Body\HasJsonBody;
 
 class CreateUserRequest extends Request implements HasBody
diff --git a/src/Requests/Users/GetUserRequest.php b/src/Requests/Users/GetUserRequest.php
@@ -3,9 +3,9 @@
 namespace CodebarAg\Zammad\Requests\Users;
 
 use CodebarAg\Zammad\DTO\User;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 
 class GetUserRequest extends Request
 {
diff --git a/src/Requests/Users/UpdateUserRequest.php b/src/Requests/Users/UpdateUserRequest.php
@@ -4,9 +4,9 @@
 
 use CodebarAg\Zammad\DTO\User;
 use Saloon\Contracts\Body\HasBody;
-use Saloon\Contracts\Response;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
+use Saloon\Http\Response;
 use Saloon\Traits\Body\HasJsonBody;
 
 class UpdateUserRequest extends Request implements HasBody

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`namespace CodebarAg\Zammad\Requests\Comments;`
`4`	`4`
`5`	`5`	`use CodebarAg\Zammad\DTO\Comment;`
`6`		`-use Saloon\Contracts\Response;`
`7`	`6`	`use Saloon\Enums\Method;`
`8`	`7`	`use Saloon\Http\Request;`
	`8`	`+use Saloon\Http\Response;`
`9`	`9`
`10`	`10`	`class GetCommentRequest extends Request`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`namespace CodebarAg\Zammad\Requests\ObjectAttribute;`
`4`	`4`
`5`	`5`	`use CodebarAg\Zammad\DTO\ObjectAttribute;`
`6`		`-use Saloon\Contracts\Response;`
`7`	`6`	`use Saloon\Enums\Method;`
`8`	`7`	`use Saloon\Http\Request;`
	`8`	`+use Saloon\Http\Response;`
`9`	`9`
`10`	`10`	`class GetObjectAttributeRequest extends Request`
`11`	`11`	`{`