Fixed #1.

`ItnValidator` will default testing to false.

Author: warrickbayman

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.2.4] 26-01-2022
+### Fixed
+* Exception thrown when using `ItnValidator->validate()` without calling `testing()`. The validator will now assume testing is `false`.
+
 ## [0.2.3] 27-08-2021
 ### Fixed
 * When posting to PayFast in production, the url should be `www.payfast.co.za` (with the "www" bit).

src/ItnValidator.php

@@ -11,7 +11,7 @@ class ItnValidator
 {
     protected array $data;
     protected PayFastResponse $response;
-    protected bool $testing;
+    protected bool $testing = false;
     protected ?string $error = null;
 
     public function __construct(array $responseData)

src/Merchant.php

@@ -4,6 +4,11 @@
 
 namespace TPG\PayFast;
 
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
+use Illuminate\Support\Arr;
+use TPG\PayFast\Exceptions\PayFastException;
+
 class Merchant
 {
     protected $attributes = [
@@ -22,6 +27,26 @@ public function __construct(string $merchantId, string $merchantKey, string $pas
         $this->passphrase = $passphrase;
     }
 
+    public function ping(bool $testing = false, Client $client = null): bool
+    {
+
+        try {
+            $response = (new Request($this))->testing($testing)->make('get', 'ping');
+
+            if (Arr::get($response, 'status') === 'failed') {
+                // todo: There's a bug in the response from PayFast at the moment.
+                // todo: The `data.message` appears to be boolean, while `data.response` appears to be a string.
+                // todo: Also, the response from a live ping always returns a 500 error.
+                throw new PayFastException(Arr::get($response, 'data.message'), $response['code']);
+            }
+
+            return true;
+
+        } catch (ClientException $exception) {
+            throw new PayFastException($exception->getMessage(), $exception->getCode());
+        }
+    }
+
     public function merchantId(): string
     {
         return $this->attributes['merchant_id'];

src/Request.php

@@ -0,0 +1,109 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TPG\PayFast;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
+use http\Encoding\Stream;
+use TPG\PayFast\Exceptions\PayFastException;
+
+class Request
+{
+    protected const ENDPOINT = 'https://api.payfast.co.za';
+
+    protected Client $client;
+    protected Merchant $merchant;
+    protected bool $testing = false;
+
+    public function __construct(Merchant $merchant, Client $client = null)
+    {
+        $this->merchant = $merchant;
+        $this->client = $client ?? new Client();
+    }
+
+    public function testing(bool $testing = true): self
+    {
+        $this->testing = $testing;
+
+        return $this;
+    }
+
+    public function make(string $method, string $uri, array $formParams = []): array
+    {
+        try {
+            $response = $this->client->request($method, $this->endpoint($uri), [
+                'headers' => $this->headers(),
+                'form_params' => $formParams,
+                'query' => [
+                    'testing' => $this->testing ? 'true' : 'false',
+                ]
+            ]);
+
+            if ($response->getStatusCode() !== 200) {
+                throw new PayFastException('Bad response from PayFast API');
+            }
+
+            return $this->extractJson($response->getBody()->getContents());
+
+        } catch (ClientException $exception) {
+
+            throw new PayFastException($this->getErrorMessage($exception->getCode()), $exception->getCode());
+
+        } catch (\JsonException $exception) {
+
+            throw new PayFastException('Invalid JSON response');
+
+        }
+    }
+
+    protected function extractJson(string $contents): array
+    {
+        $json = substr(
+            $contents,
+            $startPos = strpos($contents, '{'),
+            strrpos($contents, '}') - ($startPos - 1)
+        );
+
+        return json_decode($json, true, 512, JSON_THROW_ON_ERROR);
+    }
+
+    protected function headers(array $body = []): array
+    {
+        $headers = [
+            'merchant-id' => $this->merchant->merchantId(),
+            'version' => 'v1',
+            'timestamp' => (new \DateTime())->format(DATE_ATOM),
+        ];
+
+        $headers['signature'] = (new Signature(array_merge($headers, $body), $this->merchant->passphrase()))->generate(true);
+
+        return $headers;
+    }
+
+    protected function endpoint(string $uri = null): string
+    {
+        if ($uri[0] !== '/') {
+            $uri = '/'.$uri;
+        }
+
+        return self::ENDPOINT.$uri;
+    }
+
+    protected function getErrorMessage(int $code): string
+    {
+        switch ($code) {
+            case 400:
+                return 'Invalid request';
+            case 401:
+                return 'Authorization failed';
+            case 404:
+                return 'Service not found';
+            case 429:
+                return 'Rate limited';
+            case 500:
+                return 'PayFast Application/Communication error';
+        }
+    }
+}

src/Subscription.php

@@ -110,30 +110,11 @@ protected function setData(array $data): void
 
     protected function request(string $method, string $uri = null, array $body = []): array
     {
-        $headers = [
-            'merchant-id' => $this->merchant->merchantId(),
-            'version' => 'v1',
-            'timestamp' => (new \DateTime())->format(DATE_ATOM),
-        ];
-
-        $headers['signature'] = (new Signature(array_merge($headers, $body), $this->merchant->passphrase()))->generate(true);
-
         try {
-            $response = $this->client->request($method, self::ENDPOINT . '/' . $this->token . '/' . $uri, [
-                'headers' => $headers,
-                'form_params' => $body,
-                'query' => [
-                    'testing' => $this->testing ? 'true' : 'false',
-                ],
-            ]);
-
-            $data = json_decode($response->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
 
-            if ($response->getStatusCode() !== 200) {
-                throw new PayFastException($data['status'], $data['code']);
-            }
+            return (new Request($this->merchant, $this->client))->testing($this->testing)
+                ->make($method, $this->token.'/'.$uri, $body);
 
-            return $data;
         } catch (ClientException $exception) {
             throw new PayFastException(
                 'Unable to communicate with PayFast',