make first test passes

Author: ousid

composer.json

@@ -19,9 +19,7 @@
         "php": "^8.4",
         "ext-curl": "*",
         "ext-json": "*",
-        "guzzlehttp/guzzle": "7.x",
         "illuminate/contracts": "^10.0||^11.0||^12.0",
-        "league/oauth2-client": "^2",
         "spatie/laravel-data": "^4.15",
         "spatie/laravel-package-tools": "^1.16"
     },

src/DTOs/SubscribersDTO.php

@@ -2,9 +2,11 @@
 
 namespace Coderflex\LaravelSendy\DTOs;
 
+use Spatie\LaravelData\Attributes\MergeValidationRules;
 use Spatie\LaravelData\Data;
 use Spatie\LaravelData\Support\Validation\ValidationContext;
 
+#[MergeValidationRules]
 class SubscribersDTO extends Data
 {
     public function __construct(
@@ -19,18 +21,11 @@ public function __construct(
         public ?bool $boolean,
     ) {}
 
-    // public static function rules(ValidationContext $context): array
-    // {
-    //     return [
-    //         'name' => ['string', 'nullable'],
-    //         'email' => ['required', 'string', 'email'],
-    //         'list' => ['required', 'string'],
-    //         'country' => ['string', 'nullable'],
-    //         'ipaddress' => ['string', 'nullable', 'ip'],
-    //         'referrer' => ['string', 'nullable'],
-    //         'gdpr' => ['boolean', 'nullable'],
-    //         'silent' => ['boolean', 'nullable'],
-    //         'boolean' => ['boolean', 'nullable'],
-    //     ];
-    // }
+    public static function rules(ValidationContext $context): array
+    {
+        return [
+            'email' => ['email'],
+            'ipaddress' => ['ip'],
+        ];
+    }
 }

src/LaravelSendy.php

@@ -69,13 +69,8 @@ public function __call(string $function, array $args): mixed
     /**
      * @throws \Exception
      */
-    protected function sendRequest(
-        string $type,
-        string $request,
-        array $data = [],
-        array $headers = [],
-        bool $async = false
-    ): mixed {
+    protected function sendRequest(string $type, string $request, array $data = [], array $headers = [], bool $async = false): mixed
+    {
         try {
             $mainHeaders = array_merge([
                 'Content-Type' => 'application/json',
@@ -86,7 +81,7 @@ protected function sendRequest(
                 'api_key' => $this->apiKey,
             ]);
 
-            $url = str_replace('//', '/', "$this->apiUrl/$request");
+            $url = rtrim($this->apiUrl, '/').'/'.ltrim($request, '/');
 
             $client = Http::withHeaders($headers);
 

src/Resources/Subscribers.php

@@ -9,7 +9,7 @@ class Subscribers
 {
     public function subscribe(array $data, bool $async = false)
     {
-        $data = SubscribersDTO::validateAndCreate($data)->toArray();
+        $data = SubscribersDTO::validate($data);
 
         return LaravelSendy::post('subscribe', $data, $async);
     }

tests/Resources/SubscribersTest.php

@@ -22,7 +22,7 @@
         'country' => 'UAE',
     ]);
 
-    expect($response)->toBe(['success' => true]);
+    expect($response->json())->toBe(['success' => true]);
 
     Http::assertSent(function ($request) {
         return $request->url() === 'https://sendy.test/subscribe' &&