Merge pull request #47 from Sammyjo20/feature/send-requests-on-connector

Added new method to send requests on connectors

src/Http/SaloonConnector.php

@@ -5,7 +5,7 @@
 use ReflectionClass;
 use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
-use Sammyjo20\Saloon\Traits\HasMake;
+use Sammyjo20\Saloon\Clients\MockClient;
 use Sammyjo20\Saloon\Traits\CollectsData;
 use Sammyjo20\Saloon\Traits\CollectsConfig;
 use Sammyjo20\Saloon\Traits\CollectsHeaders;
@@ -29,8 +29,7 @@ abstract class SaloonConnector implements SaloonConnectorInterface
         CollectsHandlers,
         CollectsInterceptors,
         AuthenticatesRequests,
-        HasCustomResponses,
-        HasMake;
+        HasCustomResponses;
 
     /**
      * Register Saloon requests that will become methods on the connector.
@@ -47,6 +46,17 @@ abstract class SaloonConnector implements SaloonConnectorInterface
      */
     private ?array $registeredRequests = null;
 
+    /**
+     * Instantiate a new class with the arguments.
+     *
+     * @param mixed ...$arguments
+     * @return SaloonConnector
+     */
+    public static function make(...$arguments): self
+    {
+        return new static(...$arguments);
+    }
+
     /**
      * Define anything that should be added to any requests
      * with this connector before the request is sent.
@@ -127,6 +137,29 @@ public function requestExists(string $method): bool
         return method_exists($this, $method) || array_key_exists($method, $this->getRegisteredRequests());
     }
 
+    /**
+     * Prepare a new request by providing it the current instance of the connector.
+     *
+     * @param SaloonRequest $request
+     * @return SaloonRequest
+     */
+    public function request(SaloonRequest $request): SaloonRequest
+    {
+        return $request->setConnector($this);
+    }
+
+    /**
+     * Send a Saloon request with the current instance of the connector.
+     *
+     * @throws \ReflectionException
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws \Sammyjo20\Saloon\Exceptions\SaloonException
+     */
+    public function send(SaloonRequest $request, MockClient $mockClient = null): SaloonResponse
+    {
+        return $this->request($request)->send($mockClient);
+    }
+
     /**
      * Dynamically proxy other methods to try and call a requests.
      *

src/Http/SaloonRequest.php

@@ -2,7 +2,6 @@
 
 namespace Sammyjo20\Saloon\Http;
 
-use Sammyjo20\Saloon\Traits\HasMake;
 use Sammyjo20\Saloon\Traits\CollectsData;
 use Sammyjo20\Saloon\Traits\SendsRequests;
 use Sammyjo20\Saloon\Traits\CollectsConfig;
@@ -27,8 +26,7 @@ abstract class SaloonRequest implements SaloonRequestInterface
         CollectsInterceptors,
         AuthenticatesRequests,
         HasCustomResponses,
-        SendsRequests,
-        HasMake;
+        SendsRequests;
 
     /**
      * Define the method that the request will use.
@@ -51,6 +49,17 @@ abstract class SaloonRequest implements SaloonRequestInterface
      */
     private ?SaloonConnector $loadedConnector = null;
 
+    /**
+     * Instantiate a new class with the arguments.
+     *
+     * @param mixed ...$arguments
+     * @return SaloonRequest
+     */
+    public static function make(...$arguments): self
+    {
+        return new static(...$arguments);
+    }
+
     /**
      * Define anything that should be added to the request
      * before it is sent.

src/Http/SaloonResponse.php

@@ -62,7 +62,7 @@ class SaloonResponse
      *
      * @var object|null
      */
-    protected ?object $dto = null;
+    protected mixed $dto = null;
 
     /**
      * Determines if the response has been cached
@@ -195,7 +195,7 @@ public function collect($key = null): Collection
      *
      * @return object|null
      */
-    public function dto(): ?object
+    public function dto(): mixed
     {
         return $this->dto;
     }
@@ -436,10 +436,10 @@ public function getGuzzleException(): ?RequestException
     /**
      * Set the DTO on the response.
      *
-     * @param object $dto
+     * @param mixed $dto
      * @return $this
      */
-    public function setDto(object $dto): self
+    public function setDto(mixed $dto): self
     {
         $this->dto = $dto;
 

src/Traits/Plugins/CastsToDto.php

@@ -29,7 +29,7 @@ public function bootCastsToDto(SaloonRequest $request): void
      * Define how Saloon should cast to your DTO.
      *
      * @param SaloonResponse $response
-     * @return object
+     * @return mixed
      */
-    abstract protected function castToDto(SaloonResponse $response): object;
+    abstract protected function castToDto(SaloonResponse $response): mixed;
 }

tests/Feature/MockRequestTest.php

@@ -100,8 +100,8 @@
     $requestC = new DifferentServiceUserRequest;
 
     $mockClient = new MockClient([
-        'saloon-test.samcarre.dev/api/user' => $responseA, // Test Exact Route
-        'saloon-test.samcarre.dev/*' => $responseB, // Test Wildcard Routes
+        'tests.saloon.dev/api/user' => $responseA, // Test Exact Route
+        'tests.saloon.dev/*' => $responseB, // Test Wildcard Routes
         'google.com/*' => $responseC, // Test Different Route,
     ]);
 
@@ -134,8 +134,8 @@
     $requestC = new DifferentServiceUserRequest;
 
     $mockClient = new MockClient([
-        'saloon-test.samcarre.dev/api/user' => $responseA, // Test Exact Route
-        'saloon-test.samcarre.dev/*' => $responseB, // Test Wildcard Routes
+        'tests.saloon.dev/api/user' => $responseA, // Test Exact Route
+        'tests.saloon.dev/*' => $responseB, // Test Wildcard Routes
         '*' => $responseC,
     ]);
 

tests/Pest.php

@@ -41,5 +41,5 @@
 
 function apiUrl()
 {
-    return 'https://saloon-test.samcarre.dev/api';
+    return 'https://tests.saloon.dev/api';
 }

tests/Unit/ConnectorTest.php

@@ -1,5 +1,10 @@
 <?php
 
+use Sammyjo20\Saloon\Http\MockResponse;
+use Sammyjo20\Saloon\Clients\MockClient;
+use Sammyjo20\Saloon\Http\SaloonRequest;
+use Sammyjo20\Saloon\Http\SaloonResponse;
+use Sammyjo20\Saloon\Tests\Fixtures\Requests\UserRequest;
 use Sammyjo20\Saloon\Tests\Fixtures\Connectors\TestConnector;
 use Sammyjo20\Saloon\Tests\Fixtures\Connectors\RequestSelectionConnector;
 
@@ -13,3 +18,25 @@
     expect($connectorB)->toBeInstanceOf(RequestSelectionConnector::class);
     expect($connectorB)->apiKey->toEqual('yee-haw-1-2-3');
 });
+
+test('you can prepare a request through the connector', function () {
+    $connector = new TestConnector();
+    $connector->unique = true;
+
+    $request = $connector->request(new UserRequest);
+
+    expect($request)->toBeInstanceOf(SaloonRequest::class);
+    expect($request->getConnector())->toEqual($connector);
+});
+
+test('you can send a request through the connector', function () {
+    $mockClient = new MockClient([
+        new MockResponse(['name' => 'Sammyjo20', 'actual_name' => 'Sam Carré', 'twitter' => '@carre_sam']),
+    ]);
+
+    $connector = new TestConnector();
+    $response = $connector->send(new UserRequest, $mockClient);
+
+    expect($response)->toBeInstanceOf(SaloonResponse::class);
+    expect($response->json())->toEqual(['name' => 'Sammyjo20', 'actual_name' => 'Sam Carré', 'twitter' => '@carre_sam']);
+});

tests/Unit/MockClientAssertionsTest.php

@@ -57,7 +57,7 @@
 
     (new UserRequest())->send($mockClient);
 
-    $mockClient->assertSent('samcarre.dev/*');
+    $mockClient->assertSent('saloon.dev/*');
     $mockClient->assertSent('/user');
     $mockClient->assertSent('api/user');
 });

tests/Unit/MockClientTest.php

@@ -65,8 +65,8 @@
     $requestC = new DifferentServiceUserRequest;
 
     $mockClient = new MockClient([
-        'saloon-test.samcarre.dev/api/user' => $responseA, // Test Exact Route
-        'saloon-test.samcarre.dev/*' => $responseB, // Test Wildcard Routes
+        'tests.saloon.dev/api/user' => $responseA, // Test Exact Route
+        'tests.saloon.dev/*' => $responseB, // Test Wildcard Routes
         'google.com/*' => $responseC, // Test Different Route,
     ]);
 
@@ -85,8 +85,8 @@
     $requestC = new DifferentServiceUserRequest;
 
     $mockClient = new MockClient([
-        'saloon-test.samcarre.dev/api/user' => $responseA, // Test Exact Route
-        'saloon-test.samcarre.dev/*' => $responseB, // Test Wildcard Routes
+        'tests.saloon.dev/api/user' => $responseA, // Test Exact Route
+        'tests.saloon.dev/*' => $responseB, // Test Wildcard Routes
         '*' => $responseC,
     ]);
 
@@ -105,8 +105,8 @@
     $requestC = new DifferentServiceUserRequest;
 
     $mockClient = new MockClient([
-        'saloon-test.samcarre.dev/api/user' => $responseA, // Test Exact Route
-        'saloon-test.samcarre.dev/*' => $responseB, // Test Wildcard Routes
+        'tests.saloon.dev/api/user' => $responseA, // Test Exact Route
+        'tests.saloon.dev/*' => $responseB, // Test Wildcard Routes
     ]);
 
     expect($mockClient->guessNextResponse($requestA))->toEqual($responseA);