WIP: Use PHP-HTTP Discovery, PSR-7, PSR-17 & PSR-18

Author: SharkMachine

.gitignore

@@ -1,3 +1,5 @@
+.idea
 test-reports/
+vendor/
 composer.lock
 *.cache

composer.json

@@ -16,7 +16,10 @@
     "require": {
         "php": ">=7.3",
         "ext-json": "*",
-        "ext-curl": "*"
+        "php-http/discovery": "^1.19",
+        "psr/http-client": "^1.0",
+        "psr/http-factory": "^1.0",
+        "psr/http-message": "^1.0 || ^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0 || ^9.0",
@@ -25,7 +28,8 @@
         "phpmd/phpmd": "^2.10",
         "phpstan/phpstan": "1.9.14",
         "mockery/mockery": "^1.5",
-        "guzzlehttp/guzzle": "^7.0|^6.0"
+        "guzzlehttp/guzzle": "^7.0|^6.0",
+        "roave/security-advisories": "dev-latest"
     },
     "autoload": {
         "psr-4": {
@@ -45,5 +49,10 @@
             "\"vendor/bin/phpmd\" src,tests text unusedcode || RETVAL=1",
             "\"vendor/bin/phpcs\" src tests --extensions=\"php\" --encoding=\"UTF-8\" --standard=\"PSR12\""
         ]
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     }
 }

src/Client.php

@@ -39,6 +39,8 @@
 use Paytrail\SDK\Exception\RequestException;
 use Paytrail\SDK\Exception\ClientException;
 use Paytrail\SDK\Response\AddCardPaymentResponse;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
 
 /**
  * Class Client
@@ -65,14 +67,21 @@ class Client extends PaytrailClient
      * @param int $merchantId The merchant.
      * @param string $secretKey The secret key.
      * @param string $platformName Platform name.
+     * @param ClientInterface|null $client HTTP client
+     * @param RequestFactoryInterface|null $requestFactory HTTP request factory
      */
-    public function __construct(int $merchantId, string $secretKey, string $platformName)
-    {
+    public function __construct(
+        int $merchantId,
+        string $secretKey,
+        string $platformName,
+        ?ClientInterface $client = null,
+        ?RequestFactoryInterface $requestFactory = null
+    ) {
         $this->merchantId = $merchantId;
         $this->secretKey = $secretKey;
         $this->platformName = $platformName;
 
-        $this->createHttpClient();
+        $this->createHttpClient($client, $requestFactory);
     }
 
     /**

src/PaytrailClient.php

@@ -4,10 +4,14 @@
 
 namespace Paytrail\SDK;
 
+use JsonSerializable;
+use Paytrail\SDK\Exception\ClientException;
 use Paytrail\SDK\Exception\HmacException;
 use Paytrail\SDK\Exception\ValidationException;
 use Paytrail\SDK\Util\RequestClient;
 use Paytrail\SDK\Util\Signature;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
 
 abstract class PaytrailClient
 {
@@ -39,9 +43,17 @@ abstract class PaytrailClient
      */
     protected $http_client;
 
-    protected function createHttpClient()
-    {
-        $this->http_client = new RequestClient();
+    /**
+     * @param ClientInterface|null         $client
+     * @param RequestFactoryInterface|null $requestFactory
+     *
+     * @return void
+     */
+    protected function createHttpClient(
+        ?ClientInterface $client = null,
+        ?RequestFactoryInterface $requestFactory = null
+    ): void {
+        $this->http_client = new RequestClient($client, $requestFactory);
     }
 
     /**
@@ -59,21 +71,22 @@ abstract public function validateHmac(array $response = [], string $body = '', s
     /**
      * A wrapper for post requests.
      *
-     * @param string $uri The uri for the request.
-     * @param \JsonSerializable|null $data The request payload.
-     * @param callable|null $callback The callback method to run for the decoded response.
-     * If left empty, the response is returned.
-     * @param string|null $transactionId Paytrail transaction ID when accessing single transaction.
-     * Not required for a new payment request.
-     * @param bool $signatureInHeader Checks if signature is calculated from header/body parameters
-     * @param string|null $paytrailTokenizationId Paytrail tokenization ID for getToken request
+     * @param string                $uri The uri for the request.
+     * @param JsonSerializable|null $data The request payload.
+     * @param callable|null         $callback The callback method to run for the decoded response.
+     *                                         If left empty, the response is returned.
+     * @param string|null           $transactionId Paytrail transaction ID when accessing single transaction.
+     *                                             Not required for a new payment request.
+     * @param bool                  $signatureInHeader Checks if signature is calculated from header/body parameters
+     * @param string|null           $paytrailTokenizationId Paytrail tokenization ID for getToken request
      *
      * @return mixed
      * @throws HmacException
+     * @throws ClientException
      */
     protected function post(
         string $uri,
-        \JsonSerializable $data = null,
+        JsonSerializable $data = null,
         callable $callback = null,
         string $transactionId = null,
         bool $signatureInHeader = true,
@@ -124,13 +137,14 @@ protected function post(
     /**
      * A wrapper for get requests.
      *
-     * @param string $uri The uri for the request.
-     * @param callable|null $callback The callback method to run for the decoded response.
-     * If left empty, the response is returned.
-     * @param string|null $transactionId Paytrail transaction ID when accessing single transaction.
-     * Not required for a new payment request.
+     * @param string        $uri           The uri for the request.
+     * @param callable|null $callback      The callback method to run for the decoded response.
+     *                                     If left empty, the response is returned.
+     * @param string|null   $transactionId Paytrail transaction ID when accessing single transaction.
+     *                                     Not required for a new payment request.
      *
      * @return mixed
+     * @throws ClientException
      * @throws HmacException
      */
     protected function get(string $uri, callable $callback = null, string $transactionId = null)