Merge pull request #87 from cashier-provider/3.x

Added the ability to use different query methods

Author: Andrey Helldar

composer.json

@@ -23,11 +23,12 @@
         "php": "^7.3 || ^8.0",
         "ext-json": "*",
         "doctrine/dbal": "^2.6 || ^3.0",
-        "dragon-code/contracts": "^2.16",
+        "dragon-code/contracts": "^2.18",
         "dragon-code/laravel-cache": "^2.12",
         "dragon-code/laravel-support": "^3.3.2",
         "dragon-code/simple-dto": "^2.2",
         "dragon-code/support": "^5.2",
+        "fig/http-message-util": "^1.1",
         "guzzlehttp/guzzle": "^6.5 || ^7.0",
         "illuminate/broadcasting": "^6.0 || ^7.0 || ^8.0 || ^9.0",
         "illuminate/console": "^6.0 || ^7.0 || ^8.0 || ^9.0",

src/Concerns/Logs.php

@@ -33,9 +33,9 @@ protected function logInfo(ModelResource $model, string $method, Builder $url, a
         HttpLog::info($model, $method, $url, $request, $response, $status_code, $model->getExtra());
     }
 
-    protected function logError(ModelResource $model, string $method, Request $request, Throwable $exception): void
+    protected function logError(ModelResource $model, Request $request, Throwable $exception): void
     {
-        $this->logInfo($model, $method, $request->uri(), $request->getRawBody(), [
+        $this->logInfo($model, $request->method(), $request->uri(), $request->getRawBody(), [
             'Message' => $exception->getMessage(),
         ], $this->getStatusCode($exception));
     }

src/Facades/Helpers/Http.php

@@ -25,11 +25,11 @@
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @method static array post(Request $request, ExceptionManager $manager)
+ * @method static array request(Request $request, ExceptionManager $manager)
  */
 class Http extends Facade
 {
-    protected static function getFacadeAccessor()
+    protected static function getFacadeAccessor(): string
     {
         return Helper::class;
     }

src/Helpers/Http.php

@@ -51,23 +51,11 @@ public function __construct(Client $client)
         $this->client = $client;
     }
 
-    /**
-     * @param \DragonCode\Contracts\Cashier\Http\Request $request
-     * @param \DragonCode\Contracts\Exceptions\Manager $manager
-     *
-     * @throws \DragonCode\Contracts\Exceptions\Http\ClientException
-     *
-     * @return array
-     */
-    public function post(Request $request, ExceptionManagerContract $manager): array
-    {
-        return $this->request('post', $request, $manager);
-    }
-
-    protected function request(string $method, Request $request, ExceptionManagerContract $exception): array
+    public function request(Request $request, ExceptionManagerContract $exception): array
     {
         try {
-            return $this->retry($this->tries, function () use ($method, $request, $exception) {
+            return $this->retry($this->tries, function () use ($request, $exception) {
+                $method  = $request->method();
                 $uri     = $request->uri();
                 $headers = $request->headers();
                 $data    = $request->body();
@@ -76,8 +64,7 @@ protected function request(string $method, Request $request, ExceptionManagerCon
 
                 $params = compact('headers') + $options + $this->body($data, $headers);
 
-                /** @var \Psr\Http\Message\ResponseInterface $response */
-                $response = $this->client->{$method}($uri, $params);
+                $response = $this->client->request($method, $uri, $params);
 
                 $content = $this->decode($response);
 
@@ -92,19 +79,19 @@ protected function request(string $method, Request $request, ExceptionManagerCon
         } catch (ClientException $e) {
             $this->failedEvent($e);
 
-            $this->logError($request->model(), $method, $request, $e);
+            $this->logError($request->model(), $request, $e);
 
             throw $e;
         } catch (GuzzleClientException $e) {
             $response = $e->getResponse();
 
             $content = $this->decode($response);
 
-            $this->logError($request->model(), $method, $request, $e);
+            $this->logError($request->model(), $request, $e);
 
             $exception->throw($request->uri(), $response->getStatusCode(), $content);
         } catch (Throwable $e) {
-            $this->logError($request->model(), $method, $request, $e);
+            $this->logError($request->model(), $request, $e);
 
             $exception->throw($request->uri(), $e->getCode(), [
                 'Message' => $e->getMessage(),

src/Http/Request.php

@@ -27,6 +27,7 @@
 use DragonCode\Contracts\Cashier\Resources\Model;
 use DragonCode\Contracts\Http\Builder as HttpBuilderContract;
 use DragonCode\Support\Concerns\Makeable;
+use Fig\Http\Message\RequestMethodInterface;
 
 /**
  * @method static Contract make(Model $model)
@@ -39,6 +40,9 @@ abstract class Request implements Contract
     /** @var \DragonCode\Contracts\Cashier\Resources\Model */
     protected $model;
 
+    /** @var string HTTP Request method */
+    protected $method = RequestMethodInterface::METHOD_POST;
+
     /** @var string */
     protected $production_host;
 
@@ -71,6 +75,11 @@ public function model(): Model
         return $this->model;
     }
 
+    public function method(): string
+    {
+        return $this->method;
+    }
+
     public function uri(): HttpBuilderContract
     {
         return $this->getUriBuilder()->getWithPath($this->getPath());

src/Services/Driver.php

@@ -70,8 +70,7 @@ public function __construct(DriverConfig $config, Model $payment)
     public function statuses(): Statuses
     {
         return $this->resolveDynamicCallback($this->statuses, function (string $statuses) {
-            // @var \DragonCode\Contracts\Cashier\Helpers\Statuses|string $statuses
-
+            /** @var \DragonCode\Contracts\Cashier\Helpers\Statuses|string $statuses */
             return $statuses::make($this->payment);
         });
     }
@@ -98,7 +97,7 @@ protected function request(RequestResource $request, string $response): Response
     {
         $manager = $this->resolveExceptionManager();
 
-        $content = Http::post($request, $manager);
+        $content = Http::request($request, $manager);
 
         return $response::make($content);
     }